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

[Eric Bélanger]

    Date: Tuesday, January 24, 2012 @ 17:46:40
  Author: eric
Revision: 147231

upgpkg: wesnoth 1.8.6-4

Rebuild against libpng 1.5 and libtiff 4.0, Add python2 depends

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

----------------------------+
 PKGBUILD                   |    7 ++++---
 wesnoth-libpng-1.4.0.patch |   10 ++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-24 20:46:21 UTC (rev 147230)
+++ PKGBUILD	2012-01-24 22:46:40 UTC (rev 147231)
@@ -6,12 +6,12 @@
 
 pkgname=wesnoth
 pkgver=1.8.6
-pkgrel=3
+pkgrel=4
 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' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core')
+depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2')
 makedepends=('boost')
 install=wesnoth.install
 options=(!emptydirs)
@@ -20,7 +20,7 @@
         wesnoth-1.8.6-boost-foreach.patch
         wesnoth.tmpfiles.conf)
 md5sums=('f1c3179869b01b61e253e74aeb241034'
-         'ca7412ffc4682ef55ddf82d56b0e2f08'
+         '3b0d2edcb45e8ecc8c790f92bdcb0087'
          'dc414ab7e1334941548e9db6db9c2460'
          'b8122f5054e3895c9c054e87460869dc')
 
@@ -31,6 +31,7 @@
   ./autogen.sh
   ./configure --prefix=/usr --localstatedir=/var --enable-tools \
       --enable-editor --enable-server --with-fifodir=/run/wesnothd
+  make
 }
 
 package() {

Modified: wesnoth-libpng-1.4.0.patch
===================================================================
--- wesnoth-libpng-1.4.0.patch	2012-01-24 20:46:21 UTC (rev 147230)
+++ wesnoth-libpng-1.4.0.patch	2012-01-24 22:46:40 UTC (rev 147231)
@@ -12,3 +12,13 @@
  	if(!png_ptr)
  		throw exploder_failure("Unable to initialize the png write structure");
  
+--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600
++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600
+@@ -15,6 +15,7 @@
+ #include "exploder_utils.hpp"
+ #include "game_config.hpp"
+ #include "serialization/string_utils.hpp"
++#include <zlib.h>
+ #include <png.h>
+
+ exploder_point::exploder_point(const std::string &s)