Date: Tuesday, January 27, 2015 @ 11:34:06 Author: ronald Revision: 230051
archrelease: copy trunk to extra-i686, extra-x86_64 Added: stellarium/repos/extra-i686/PKGBUILD (from rev 230050, stellarium/trunk/PKGBUILD) stellarium/repos/extra-i686/libpng14.patch (from rev 230050, stellarium/trunk/libpng14.patch) stellarium/repos/extra-i686/stellarium.install (from rev 230050, stellarium/trunk/stellarium.install) stellarium/repos/extra-x86_64/PKGBUILD (from rev 230050, stellarium/trunk/PKGBUILD) stellarium/repos/extra-x86_64/libpng14.patch (from rev 230050, stellarium/trunk/libpng14.patch) stellarium/repos/extra-x86_64/stellarium.install (from rev 230050, stellarium/trunk/stellarium.install) Deleted: stellarium/repos/extra-i686/PKGBUILD stellarium/repos/extra-i686/libpng14.patch stellarium/repos/extra-i686/stellarium.desktop stellarium/repos/extra-i686/stellarium.install 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.install stellarium/repos/extra-x86_64/stellarium.png ---------------------------------+ /PKGBUILD | 60 ++++++++++++++++++++++++++++++++++++++ /libpng14.patch | 42 ++++++++++++++++++++++++++ /stellarium.install | 28 +++++++++++++++++ extra-i686/PKGBUILD | 40 ------------------------- extra-i686/libpng14.patch | 21 ------------- extra-i686/stellarium.desktop | 9 ----- extra-i686/stellarium.install | 14 -------- extra-x86_64/PKGBUILD | 40 ------------------------- extra-x86_64/libpng14.patch | 21 ------------- extra-x86_64/stellarium.desktop | 9 ----- extra-x86_64/stellarium.install | 14 -------- 11 files changed, 130 insertions(+), 168 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-01-27 10:33:51 UTC (rev 230050) +++ extra-i686/PKGBUILD 2015-01-27 10:34:06 UTC (rev 230051) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=stellarium -pkgver=0.13.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' 'glu' 'libgl' 'freetype2' 'qt5-quick1' 'openssl' - 'desktop-file-utils' 'xdg-utils' 'phonon') -install=stellarium.install -makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl' 'qt5-tools') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - stellarium.desktop - stellarium.png) -sha1sums=('0e9937de152f4b72204290b9a1893bfec8afbd21' - '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 230050, stellarium/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-01-27 10:34:06 UTC (rev 230051) @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=stellarium +pkgver=0.13.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' 'glu' 'libgl' 'freetype2' 'qt5-quick1' 'openssl' + 'desktop-file-utils' 'xdg-utils' 'phonon') +install=stellarium.install +makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl' 'qt5-tools') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('ee6b631b6e64762d4972468299013de8d44abf43') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/libpng14.patch =================================================================== --- extra-i686/libpng14.patch 2015-01-27 10:33:51 UTC (rev 230050) +++ extra-i686/libpng14.patch 2015-01-27 10:34:06 UTC (rev 230051) @@ -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 230050, stellarium/trunk/libpng14.patch) =================================================================== --- extra-i686/libpng14.patch (rev 0) +++ extra-i686/libpng14.patch 2015-01-27 10:34:06 UTC (rev 230051) @@ -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 2015-01-27 10:33:51 UTC (rev 230050) +++ extra-i686/stellarium.desktop 2015-01-27 10:34:06 UTC (rev 230051) @@ -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 Deleted: extra-i686/stellarium.install =================================================================== --- extra-i686/stellarium.install 2015-01-27 10:33:51 UTC (rev 230050) +++ extra-i686/stellarium.install 2015-01-27 10:34:06 UTC (rev 230051) @@ -1,14 +0,0 @@ -pkgname=stellarium - -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} Copied: stellarium/repos/extra-i686/stellarium.install (from rev 230050, stellarium/trunk/stellarium.install) =================================================================== --- extra-i686/stellarium.install (rev 0) +++ extra-i686/stellarium.install 2015-01-27 10:34:06 UTC (rev 230051) @@ -0,0 +1,14 @@ +pkgname=stellarium + +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} Deleted: extra-i686/stellarium.png =================================================================== (Binary files differ) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-01-27 10:33:51 UTC (rev 230050) +++ extra-x86_64/PKGBUILD 2015-01-27 10:34:06 UTC (rev 230051) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=stellarium -pkgver=0.13.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' 'glu' 'libgl' 'freetype2' 'qt5-quick1' 'openssl' - 'desktop-file-utils' 'xdg-utils' 'phonon') -install=stellarium.install -makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl' 'qt5-tools') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - stellarium.desktop - stellarium.png) -sha1sums=('0e9937de152f4b72204290b9a1893bfec8afbd21' - '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 230050, stellarium/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-01-27 10:34:06 UTC (rev 230051) @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=stellarium +pkgver=0.13.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' 'glu' 'libgl' 'freetype2' 'qt5-quick1' 'openssl' + 'desktop-file-utils' 'xdg-utils' 'phonon') +install=stellarium.install +makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl' 'qt5-tools') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('ee6b631b6e64762d4972468299013de8d44abf43') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/libpng14.patch =================================================================== --- extra-x86_64/libpng14.patch 2015-01-27 10:33:51 UTC (rev 230050) +++ extra-x86_64/libpng14.patch 2015-01-27 10:34:06 UTC (rev 230051) @@ -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 230050, stellarium/trunk/libpng14.patch) =================================================================== --- extra-x86_64/libpng14.patch (rev 0) +++ extra-x86_64/libpng14.patch 2015-01-27 10:34:06 UTC (rev 230051) @@ -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 2015-01-27 10:33:51 UTC (rev 230050) +++ extra-x86_64/stellarium.desktop 2015-01-27 10:34:06 UTC (rev 230051) @@ -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 Deleted: extra-x86_64/stellarium.install =================================================================== --- extra-x86_64/stellarium.install 2015-01-27 10:33:51 UTC (rev 230050) +++ extra-x86_64/stellarium.install 2015-01-27 10:34:06 UTC (rev 230051) @@ -1,14 +0,0 @@ -pkgname=stellarium - -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} Copied: stellarium/repos/extra-x86_64/stellarium.install (from rev 230050, stellarium/trunk/stellarium.install) =================================================================== --- extra-x86_64/stellarium.install (rev 0) +++ extra-x86_64/stellarium.install 2015-01-27 10:34:06 UTC (rev 230051) @@ -0,0 +1,14 @@ +pkgname=stellarium + +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} Deleted: extra-x86_64/stellarium.png =================================================================== (Binary files differ)