Date: Thursday, August 23, 2018 @ 19:12:12 Author: ronald Revision: 332868
archrelease: copy trunk to extra-x86_64 Added: stellarium/repos/extra-x86_64/PKGBUILD (from rev 332867, stellarium/trunk/PKGBUILD) stellarium/repos/extra-x86_64/libpng14.patch (from rev 332867, stellarium/trunk/libpng14.patch) Deleted: stellarium/repos/extra-x86_64/PKGBUILD stellarium/repos/extra-x86_64/libpng14.patch ----------------+ PKGBUILD | 63 +++++++++++++++++++++++++++---------------------------- libpng14.patch | 42 ++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 52 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-08-23 19:12:03 UTC (rev 332867) +++ PKGBUILD 2018-08-23 19:12:12 UTC (rev 332868) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=stellarium -pkgver=0.18.1 -pkgrel=1 -pkgdesc="A stellarium with great graphics and a nice database of sky-objects" -arch=("x86_64") -url="http://stellarium.org/" -license=('GPL2') -depends=('libpng' 'libgl' 'freetype2' 'openssl' 'qt5-script' - 'qt5-serialport' 'qt5-multimedia' 'qt5-location' 'gpsd') -makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl' 'qt5-tools') -source=(https://github.com/Stellarium/stellarium/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz) -sha512sums=('3e9bf4590c8b96f0218d79a4eebda13e8c99157f30750a2c77b571e53baba5d213e3e72593520ebd0fc73b7d2191d9f90496ee246dc1f0924e7e5c4cf9131d21') - - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE - make -} - - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} Copied: stellarium/repos/extra-x86_64/PKGBUILD (from rev 332867, stellarium/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-08-23 19:12:12 UTC (rev 332868) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=stellarium +pkgver=0.18.2 +pkgrel=1 +pkgdesc="A stellarium with great graphics and a nice database of sky-objects" +arch=("x86_64") +url="http://stellarium.org/" +license=('GPL2') +depends=('libpng' 'libgl' 'freetype2' 'openssl' 'qt5-script' + 'qt5-serialport' 'qt5-multimedia' 'qt5-location' 'gpsd') +makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl' 'qt5-tools') +source=(https://github.com/Stellarium/stellarium/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.asc}) +validpgpkeys=('79151C2E6351E7278DA1A730BF38D4D02A328DFF') # Alexander Wolf <alex.v.w...@gmail.com> +sha256sums=('7582a8ef96ab673a17a248b97bc9deb69b9d65f07e9689f1761c284e36b028db' + 'SKIP') + +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: libpng14.patch =================================================================== --- libpng14.patch 2018-08-23 19:12:03 UTC (rev 332867) +++ libpng14.patch 2018-08-23 19:12:12 UTC (rev 332868) @@ -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 332867, stellarium/trunk/libpng14.patch) =================================================================== --- libpng14.patch (rev 0) +++ libpng14.patch 2018-08-23 19:12:12 UTC (rev 332868) @@ -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);