[arch-commits] Commit in wesnoth/trunk (PKGBUILD wesnoth-libpng-1.4.0.patch)

[Tobias Powalowski]

    Date: Saturday, January 23, 2010 @ 08:31:08
  Author: tpowa
Revision: 64939

upgpkg: wesnoth 1.6.5-3
    rebuild against libpng

Added:
  wesnoth/trunk/wesnoth-libpng-1.4.0.patch
Modified:
  wesnoth/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |    9 ++++++---
 wesnoth-libpng-1.4.0.patch |   22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-23 12:23:20 UTC (rev 64938)
+++ PKGBUILD	2010-01-23 13:31:08 UTC (rev 64939)
@@ -5,19 +5,22 @@
 
 pkgname=wesnoth
 pkgver=1.6.5
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.wesnoth.org/"
 depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'libvorbis' 'fribidi' 'freetype2' 'gcc-libs' 'boost>=1.41.0' 'pango')
 install=wesnoth.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+        wesnoth-libpng-1.4.0.patch)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i ../wesnoth-libpng-1.4.0.patch || return 1
   ./configure --prefix=/usr --localstatedir=/var --enable-tools --enable-editor --enable-server
   make || return 1
   make DESTDIR="$pkgdir" install
 }
-md5sums=('493826bbd9ba355930765a7e8fe3749a')
+md5sums=('493826bbd9ba355930765a7e8fe3749a'
+         '2cd5bf5f544a48104f694a8bf846758e')

Added: wesnoth-libpng-1.4.0.patch
===================================================================
--- wesnoth-libpng-1.4.0.patch	                        (rev 0)
+++ wesnoth-libpng-1.4.0.patch	2010-01-23 13:31:08 UTC (rev 64939)
@@ -0,0 +1,22 @@
+--- wesnoth-1.6.5/src/tools/exploder_utils.cpp~	2010-01-22 11:20:31.000000000 +0100
++++ wesnoth-1.6.5/src/tools/exploder_utils.cpp	2010-01-22 11:20:31.000000000 +0100
+@@ -174,7 +174,7 @@
+ 	//TODO: review whether providing NULL error handlers is something
+ 	//sensible
+ 	png_struct* png_ptr = png_create_write_struct
+-		(PNG_LIBPNG_VER_STRING, (png_voidp)png_voidp_NULL,
++		(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
+ 		 png_error_ptr_NULL, png_error_ptr_NULL);
+ 	if(!png_ptr)
+ 		throw exploder_failure("Unable to initialize the png write structure");
+--- wesnoth-1.6.5/src/tools/exploder_utils.cpp~	2010-01-22 11:24:11.000000000 +0100
++++ wesnoth-1.6.5/src/tools/exploder_utils.cpp	2010-01-22 11:24:11.000000000 +0100
+@@ -175,7 +175,7 @@
+ 	//sensible
+ 	png_struct* png_ptr = png_create_write_struct
+ 		(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
+-		 png_error_ptr_NULL, png_error_ptr_NULL);
++		 NULL, NULL);
+ 	if(!png_ptr)
+ 		throw exploder_failure("Unable to initialize the png write structure");
+