[arch-commits] Commit in stellarium/repos/extra-x86_64 (4 files)

[Ronald van Haren]

    Date: Wednesday, March 28, 2018 @ 08:48:31
  Author: ronald
Revision: 320540

archrelease: copy trunk to extra-x86_64

Added:
  stellarium/repos/extra-x86_64/PKGBUILD
    (from rev 320539, stellarium/trunk/PKGBUILD)
  stellarium/repos/extra-x86_64/libpng14.patch
    (from rev 320539, stellarium/trunk/libpng14.patch)
Deleted:
  stellarium/repos/extra-x86_64/PKGBUILD
  stellarium/repos/extra-x86_64/libpng14.patch

----------------+
 PKGBUILD       |   60 ++++++++++++++++++++++++++++---------------------------
 libpng14.patch |   42 +++++++++++++++++++-------------------
 2 files changed, 52 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-28 08:48:14 UTC (rev 320539)
+++ PKGBUILD	2018-03-28 08:48:31 UTC (rev 320540)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-
-pkgname=stellarium
-pkgver=0.17.0
-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)
-sha1sums=('dd76beae36ad2360c85ae7115a23b29ff194cc15')
-	
-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 320539, stellarium/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-03-28 08:48:31 UTC (rev 320540)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+
+pkgname=stellarium
+pkgver=0.18.0
+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=('cbbc35f1f0f065b2d540010b753c9686dbf6045eee059c9ea8383d9940ed3101f53da069119f9c611288902b79e4ce4005bf3088e402cc83aebd93257e36a3e7')
+
+
+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-03-28 08:48:14 UTC (rev 320539)
+++ libpng14.patch	2018-03-28 08:48:31 UTC (rev 320540)
@@ -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 320539, stellarium/trunk/libpng14.patch)
===================================================================
--- libpng14.patch	                        (rev 0)
+++ libpng14.patch	2018-03-28 08:48:31 UTC (rev 320540)
@@ -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);