Date: Sunday, April 1, 2012 @ 05:19:54 Author: ronald Revision: 154997
archrelease: copy trunk to extra-i686, extra-x86_64 Added: stellarium/repos/extra-i686/PKGBUILD (from rev 154996, stellarium/trunk/PKGBUILD) stellarium/repos/extra-i686/libpng14.patch (from rev 154996, stellarium/trunk/libpng14.patch) stellarium/repos/extra-i686/stellarium.desktop (from rev 154996, stellarium/trunk/stellarium.desktop) stellarium/repos/extra-i686/stellarium.png (from rev 154996, stellarium/trunk/stellarium.png) stellarium/repos/extra-x86_64/PKGBUILD (from rev 154996, stellarium/trunk/PKGBUILD) stellarium/repos/extra-x86_64/libpng14.patch (from rev 154996, stellarium/trunk/libpng14.patch) stellarium/repos/extra-x86_64/stellarium.desktop (from rev 154996, stellarium/trunk/stellarium.desktop) stellarium/repos/extra-x86_64/stellarium.png (from rev 154996, stellarium/trunk/stellarium.png) Deleted: stellarium/repos/extra-i686/PKGBUILD stellarium/repos/extra-i686/libpng14.patch stellarium/repos/extra-i686/stellarium.desktop stellarium/repos/extra-i686/stellarium.png stellarium/repos/extra-x86_64/PKGBUILD stellarium/repos/extra-x86_64/libpng14.patch stellarium/repos/extra-x86_64/stellarium.desktop stellarium/repos/extra-x86_64/stellarium.png ---------------------------------+ extra-i686/PKGBUILD | 76 +++++++++++++++++++------------------- extra-i686/libpng14.patch | 42 ++++++++++----------- extra-i686/stellarium.desktop | 18 ++++----- extra-x86_64/PKGBUILD | 76 +++++++++++++++++++------------------- extra-x86_64/libpng14.patch | 42 ++++++++++----------- extra-x86_64/stellarium.desktop | 18 ++++----- 6 files changed, 136 insertions(+), 136 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-04-01 09:19:07 UTC (rev 154996) +++ extra-i686/PKGBUILD 2012-04-01 09:19:54 UTC (rev 154997) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=stellarium -pkgver=0.11.1 -pkgrel=1 -pkgdesc="A stellarium with great graphics and a nice database of sky-objects" -arch=("i686" "x86_64") -url="http://stellarium.free.fr/" -license=('GPL2') -depends=('libpng' 'mesa' 'libgl' 'freetype2' 'qt' 'openssl') -makedepends=('cmake' 'boost') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - stellarium.desktop - stellarium.png) -sha1sums=('e721a9cef0c736354c477fdb25cce607a9a3b52e' - 'c9cc79212542238227b5bd6af99f60fe056f4ab2' - 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - # install desktop file & pixmap - install -Dm644 ${srcdir}/stellarium.desktop \ - ${pkgdir}/usr/share/applications/stellarium.desktop - install -Dm644 ${srcdir}/stellarium.png \ - ${pkgdir}/usr/share/pixmaps/stellarium.png -} Copied: stellarium/repos/extra-i686/PKGBUILD (from rev 154996, stellarium/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-04-01 09:19:54 UTC (rev 154997) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=stellarium +pkgver=0.11.2 +pkgrel=1 +pkgdesc="A stellarium with great graphics and a nice database of sky-objects" +arch=("i686" "x86_64") +url="http://stellarium.free.fr/" +license=('GPL2') +depends=('libpng' 'mesa' 'libgl' 'freetype2' 'qt' 'openssl') +makedepends=('cmake' 'boost') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + stellarium.desktop + stellarium.png) +sha1sums=('ed77c612b53d74dc2264b1be05f19d05950a1771' + 'c9cc79212542238227b5bd6af99f60fe056f4ab2' + 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + # install desktop file & pixmap + install -Dm644 ${srcdir}/stellarium.desktop \ + ${pkgdir}/usr/share/applications/stellarium.desktop + install -Dm644 ${srcdir}/stellarium.png \ + ${pkgdir}/usr/share/pixmaps/stellarium.png +} Deleted: extra-i686/libpng14.patch =================================================================== --- extra-i686/libpng14.patch 2012-04-01 09:19:07 UTC (rev 154996) +++ extra-i686/libpng14.patch 2012-04-01 09:19:54 UTC (rev 154997) @@ -1,21 +0,0 @@ -diff -Naur stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp stellarium-0.10.2/src/core/StelTextureMgr.cpp ---- stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp 2010-01-21 17:04:57.000000000 -0500 -+++ stellarium-0.10.2/src/core/StelTextureMgr.cpp 2010-01-21 17:06:55.000000000 -0500 -@@ -513,7 +513,7 @@ - fread (magic, 1, sizeof (magic), fp); - - /* check for valid magic number */ -- if (!png_check_sig (magic, sizeof (magic))) -+ if (png_sig_cmp (magic, 0, sizeof (magic))) - { - qWarning() << "error: \"" << filename << "\" is not a valid PNG image!"; - fclose (fp); -@@ -576,7 +576,7 @@ - /* convert 1-2-4 bits grayscale images to 8 bits - grayscale. */ - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) -- png_set_gray_1_2_4_to_8 (png_ptr); -+ png_set_expand_gray_1_2_4_to_8 (png_ptr); - - if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha (png_ptr); Copied: stellarium/repos/extra-i686/libpng14.patch (from rev 154996, stellarium/trunk/libpng14.patch) =================================================================== --- extra-i686/libpng14.patch (rev 0) +++ extra-i686/libpng14.patch 2012-04-01 09:19:54 UTC (rev 154997) @@ -0,0 +1,21 @@ +diff -Naur stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp stellarium-0.10.2/src/core/StelTextureMgr.cpp +--- stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp 2010-01-21 17:04:57.000000000 -0500 ++++ stellarium-0.10.2/src/core/StelTextureMgr.cpp 2010-01-21 17:06:55.000000000 -0500 +@@ -513,7 +513,7 @@ + fread (magic, 1, sizeof (magic), fp); + + /* check for valid magic number */ +- if (!png_check_sig (magic, sizeof (magic))) ++ if (png_sig_cmp (magic, 0, sizeof (magic))) + { + qWarning() << "error: \"" << filename << "\" is not a valid PNG image!"; + fclose (fp); +@@ -576,7 +576,7 @@ + /* convert 1-2-4 bits grayscale images to 8 bits + grayscale. */ + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) +- png_set_gray_1_2_4_to_8 (png_ptr); ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); + + if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png_ptr); Deleted: extra-i686/stellarium.desktop =================================================================== --- extra-i686/stellarium.desktop 2012-04-01 09:19:07 UTC (rev 154996) +++ extra-i686/stellarium.desktop 2012-04-01 09:19:54 UTC (rev 154997) @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Stellarium nightsky renderer -GenericName=Nightsky renderer -Comment=A real-time nightsky renderer -Categories=Education;Science;Astronomy; -Icon=stellarium -Exec=stellarium -Terminal=false -Type=Application Copied: stellarium/repos/extra-i686/stellarium.desktop (from rev 154996, stellarium/trunk/stellarium.desktop) =================================================================== --- extra-i686/stellarium.desktop (rev 0) +++ extra-i686/stellarium.desktop 2012-04-01 09:19:54 UTC (rev 154997) @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Stellarium nightsky renderer +GenericName=Nightsky renderer +Comment=A real-time nightsky renderer +Categories=Education;Science;Astronomy; +Icon=stellarium +Exec=stellarium +Terminal=false +Type=Application Deleted: extra-i686/stellarium.png =================================================================== (Binary files differ) Copied: stellarium/repos/extra-i686/stellarium.png (from rev 154996, stellarium/trunk/stellarium.png) =================================================================== (Binary files differ) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-04-01 09:19:07 UTC (rev 154996) +++ extra-x86_64/PKGBUILD 2012-04-01 09:19:54 UTC (rev 154997) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=stellarium -pkgver=0.11.1 -pkgrel=1 -pkgdesc="A stellarium with great graphics and a nice database of sky-objects" -arch=("i686" "x86_64") -url="http://stellarium.free.fr/" -license=('GPL2') -depends=('libpng' 'mesa' 'libgl' 'freetype2' 'qt' 'openssl') -makedepends=('cmake' 'boost') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - stellarium.desktop - stellarium.png) -sha1sums=('e721a9cef0c736354c477fdb25cce607a9a3b52e' - 'c9cc79212542238227b5bd6af99f60fe056f4ab2' - 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - # install desktop file & pixmap - install -Dm644 ${srcdir}/stellarium.desktop \ - ${pkgdir}/usr/share/applications/stellarium.desktop - install -Dm644 ${srcdir}/stellarium.png \ - ${pkgdir}/usr/share/pixmaps/stellarium.png -} Copied: stellarium/repos/extra-x86_64/PKGBUILD (from rev 154996, stellarium/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-04-01 09:19:54 UTC (rev 154997) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=stellarium +pkgver=0.11.2 +pkgrel=1 +pkgdesc="A stellarium with great graphics and a nice database of sky-objects" +arch=("i686" "x86_64") +url="http://stellarium.free.fr/" +license=('GPL2') +depends=('libpng' 'mesa' 'libgl' 'freetype2' 'qt' 'openssl') +makedepends=('cmake' 'boost') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + stellarium.desktop + stellarium.png) +sha1sums=('ed77c612b53d74dc2264b1be05f19d05950a1771' + 'c9cc79212542238227b5bd6af99f60fe056f4ab2' + 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + # install desktop file & pixmap + install -Dm644 ${srcdir}/stellarium.desktop \ + ${pkgdir}/usr/share/applications/stellarium.desktop + install -Dm644 ${srcdir}/stellarium.png \ + ${pkgdir}/usr/share/pixmaps/stellarium.png +} Deleted: extra-x86_64/libpng14.patch =================================================================== --- extra-x86_64/libpng14.patch 2012-04-01 09:19:07 UTC (rev 154996) +++ extra-x86_64/libpng14.patch 2012-04-01 09:19:54 UTC (rev 154997) @@ -1,21 +0,0 @@ -diff -Naur stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp stellarium-0.10.2/src/core/StelTextureMgr.cpp ---- stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp 2010-01-21 17:04:57.000000000 -0500 -+++ stellarium-0.10.2/src/core/StelTextureMgr.cpp 2010-01-21 17:06:55.000000000 -0500 -@@ -513,7 +513,7 @@ - fread (magic, 1, sizeof (magic), fp); - - /* check for valid magic number */ -- if (!png_check_sig (magic, sizeof (magic))) -+ if (png_sig_cmp (magic, 0, sizeof (magic))) - { - qWarning() << "error: \"" << filename << "\" is not a valid PNG image!"; - fclose (fp); -@@ -576,7 +576,7 @@ - /* convert 1-2-4 bits grayscale images to 8 bits - grayscale. */ - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) -- png_set_gray_1_2_4_to_8 (png_ptr); -+ png_set_expand_gray_1_2_4_to_8 (png_ptr); - - if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha (png_ptr); Copied: stellarium/repos/extra-x86_64/libpng14.patch (from rev 154996, stellarium/trunk/libpng14.patch) =================================================================== --- extra-x86_64/libpng14.patch (rev 0) +++ extra-x86_64/libpng14.patch 2012-04-01 09:19:54 UTC (rev 154997) @@ -0,0 +1,21 @@ +diff -Naur stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp stellarium-0.10.2/src/core/StelTextureMgr.cpp +--- stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp 2010-01-21 17:04:57.000000000 -0500 ++++ stellarium-0.10.2/src/core/StelTextureMgr.cpp 2010-01-21 17:06:55.000000000 -0500 +@@ -513,7 +513,7 @@ + fread (magic, 1, sizeof (magic), fp); + + /* check for valid magic number */ +- if (!png_check_sig (magic, sizeof (magic))) ++ if (png_sig_cmp (magic, 0, sizeof (magic))) + { + qWarning() << "error: \"" << filename << "\" is not a valid PNG image!"; + fclose (fp); +@@ -576,7 +576,7 @@ + /* convert 1-2-4 bits grayscale images to 8 bits + grayscale. */ + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) +- png_set_gray_1_2_4_to_8 (png_ptr); ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); + + if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png_ptr); Deleted: extra-x86_64/stellarium.desktop =================================================================== --- extra-x86_64/stellarium.desktop 2012-04-01 09:19:07 UTC (rev 154996) +++ extra-x86_64/stellarium.desktop 2012-04-01 09:19:54 UTC (rev 154997) @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Stellarium nightsky renderer -GenericName=Nightsky renderer -Comment=A real-time nightsky renderer -Categories=Education;Science;Astronomy; -Icon=stellarium -Exec=stellarium -Terminal=false -Type=Application Copied: stellarium/repos/extra-x86_64/stellarium.desktop (from rev 154996, stellarium/trunk/stellarium.desktop) =================================================================== --- extra-x86_64/stellarium.desktop (rev 0) +++ extra-x86_64/stellarium.desktop 2012-04-01 09:19:54 UTC (rev 154997) @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Stellarium nightsky renderer +GenericName=Nightsky renderer +Comment=A real-time nightsky renderer +Categories=Education;Science;Astronomy; +Icon=stellarium +Exec=stellarium +Terminal=false +Type=Application Deleted: extra-x86_64/stellarium.png =================================================================== (Binary files differ) Copied: stellarium/repos/extra-x86_64/stellarium.png (from rev 154996, stellarium/trunk/stellarium.png) =================================================================== (Binary files differ)