[arch-commits] Commit in 0ad/trunk (0ad-gcc6.patch PKGBUILD)

[Antonio Rojas]

    Date: Thursday, August 4, 2016 @ 19:18:01
  Author: arojas
Revision: 185089

miniunpc 2.0 rebuild

Added:
  0ad/trunk/0ad-gcc6.patch
Modified:
  0ad/trunk/PKGBUILD

----------------+
 0ad-gcc6.patch |   31 +++++++++++++++++++++++++++++++
 PKGBUILD       |   10 +++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

Added: 0ad-gcc6.patch
===================================================================
--- 0ad-gcc6.patch	                        (rev 0)
+++ 0ad-gcc6.patch	2016-08-04 19:18:01 UTC (rev 185089)
@@ -0,0 +1,31 @@
+Index: libraries/source/nvtt/src/src/nvimage/ImageIO.cpp
+===================================================================
+--- libraries/source/nvtt/src/src/nvimage/ImageIO.cpp	(revision 18164)
++++ libraries/source/nvtt/src/src/nvimage/ImageIO.cpp	(working copy)
+@@ -621,7 +621,7 @@
+ 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ 	if (png_ptr == NULL) {
+ 	//	nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name );
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	// Allocate/initialize a memory block for the image information
+@@ -629,7 +629,7 @@
+ 	if (info_ptr == NULL) {
+ 		png_destroy_read_struct(&png_ptr, NULL, NULL);
+ 	//	nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name );
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	// Set up the error handling
+@@ -636,7 +636,7 @@
+ 	if (setjmp(png_jmpbuf(png_ptr))) {
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 	//	nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	// Set up the I/O functions.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-04 19:17:11 UTC (rev 185088)
+++ PKGBUILD	2016-08-04 19:18:01 UTC (rev 185089)
@@ -5,7 +5,7 @@
 pkgname=0ad
 pkgver=a20
 _pkgver=0.0.20-alpha
-pkgrel=5
+pkgrel=6
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
 url="http://play0ad.com/"
@@ -14,12 +14,16 @@
          'libxml2' 'openal' 'sdl2' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu'
          'gloox' 'miniupnpc' 'icu' 'nspr')
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
-source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
-md5sums=('3218564020a07ce905a3db84476a3408')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz" 0ad-gcc6.patch)
+md5sums=('3218564020a07ce905a3db84476a3408'
+         '0b28aaa15e8a709ffd00e22aad69b6aa')
 
 prepare() {
   cd "$srcdir/$pkgname-$_pkgver/"
   sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.4/bin/cxxtestgen
+
+  # Fix build with GCC 6 
+  patch -p0 -i ../0ad-gcc6.patch
 }
 
 build() {