[arch-commits] Commit in wesnoth/trunk (4 files)

[Ionut Biru]

    Date: Thursday, April 8, 2010 @ 11:54:25
  Author: ibiru
Revision: 76164

upgpkg: wesnoth 1.8-1
update to 1.8.0

Modified:
  wesnoth/trunk/PKGBUILD
  wesnoth/trunk/wesnoth-libpng-1.4.0.patch
  wesnoth/trunk/wesnoth.install
Deleted:
  wesnoth/trunk/ChangeLog

----------------------------+
 ChangeLog                  |    9 ---------
 PKGBUILD                   |   13 +++++++------
 wesnoth-libpng-1.4.0.patch |   20 ++++++--------------
 wesnoth.install            |    4 ----
 4 files changed, 13 insertions(+), 33 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-04-08 15:40:44 UTC (rev 76163)
+++ ChangeLog	2010-04-08 15:54:25 UTC (rev 76164)
@@ -1,9 +0,0 @@
-
-2008-07-26  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 1.4.4
-
-2008-07-10  Douglas Soares de Andrade  <douglas at archlinux.org>
-	
-	* Updated for i686: 1.4.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-08 15:40:44 UTC (rev 76163)
+++ PKGBUILD	2010-04-08 15:54:25 UTC (rev 76164)
@@ -1,16 +1,16 @@
 # $Id$
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 # Contributor: Jacobo Arvelo <unix4all at ya.com>
-# Maintainer: Douglas Soares de Andrade <douglas at archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=wesnoth
-pkgver=1.6.5
-pkgrel=5
+pkgver=1.8
+pkgrel=1
 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')
+depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'libvorbis' 'fribidi' 'freetype2' 'gcc-libs' 'boost>=1.41.0' 'pango' 'lua')
 install=wesnoth.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
         wesnoth-libpng-1.4.0.patch)
@@ -18,9 +18,10 @@
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i ../wesnoth-libpng-1.4.0.patch || return 1
+  ./autogen.sh || return 1
   ./configure --prefix=/usr --localstatedir=/var --enable-tools --enable-editor --enable-server
   make || return 1
   make DESTDIR="$pkgdir" install
 }
-md5sums=('493826bbd9ba355930765a7e8fe3749a'
-         '2cd5bf5f544a48104f694a8bf846758e')
+sha256sums=('f4defab05ccc50abf4e029b58026e9b062bd3c58c8fff2aaa23b4f3e62cf929b'
+            '1661721a004e4f8e7a0ef4209d65f73f1aa3de3ec46baad796e75a1a6eccffdf')

Modified: wesnoth-libpng-1.4.0.patch
===================================================================
--- wesnoth-libpng-1.4.0.patch	2010-04-08 15:40:44 UTC (rev 76163)
+++ wesnoth-libpng-1.4.0.patch	2010-04-08 15:54:25 UTC (rev 76164)
@@ -1,21 +1,13 @@
---- 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 @@
+diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp
+--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp	2010-01-01 15:16:49.000000000 +0200
++++ wesnoth-1.8/src/tools/exploder_utils.cpp	2010-04-08 17:38:03.066201123 +0300
+@@ -174,8 +174,8 @@
  	//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_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL),
 -		 png_error_ptr_NULL, png_error_ptr_NULL);
++		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL),
 +		 NULL, NULL);
  	if(!png_ptr)
  		throw exploder_failure("Unable to initialize the png write structure");

Modified: wesnoth.install
===================================================================
--- wesnoth.install	2010-04-08 15:40:44 UTC (rev 76163)
+++ wesnoth.install	2010-04-08 15:54:25 UTC (rev 76164)
@@ -13,7 +13,3 @@
 post_upgrade() {
   post_install $1
 }
-
-op=$1
-shift
-$op $*
\ No newline at end of file