From 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 6 Feb 2012 23:14:50 +0000
Subject: Mon Feb  6 23:14:50 UTC 2012

---
 community/warmux/PKGBUILD           | 18 ++++++++++++------
 community/warmux/gcc-fix.patch      | 25 +++++++++++++++++++++++++
 community/warmux/include-zlib.patch | 11 +++++++++++
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 community/warmux/gcc-fix.patch
 create mode 100644 community/warmux/include-zlib.patch

(limited to 'community/warmux')

diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD
index 473e98ef7..dcf0fecad 100644
--- a/community/warmux/PKGBUILD
+++ b/community/warmux/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 47366 2011-05-22 06:58:10Z lcarlier $
+# $Id: PKGBUILD 63773 2012-02-05 12:13:45Z ibiru $
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: pukyxd 
 # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
 
 pkgname=warmux
 pkgver=11.04.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A clone of the worms game"
 arch=('i686' 'x86_64')
 url="http://www.wormux.org/"
 license=('GPL')
 makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
 replaces=('wormux')
-source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('26ff65c43a9bb61a3f0529c98b943e35')
+source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	include-zlib.patch
+	gcc-fix.patch)
+md5sums=('26ff65c43a9bb61a3f0529c98b943e35'
+         'c8285955e880f80e3c68312715a3061c'
+         '693176b72c9568c0c223be76ea7dd0d2')
 
 build() { 
   cd "${srcdir}/${pkgname}-${pkgver/.1/}"
 
-  #gcc 4.6.0 fix
-  #sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h
+  # libpng 1.5 fix
+  patch -Np1 -i ../include-zlib.patch
+  # gcc fix
+  patch -Np1 -i ../gcc-fix.patch
 
   ./configure --prefix=/usr
   make
diff --git a/community/warmux/gcc-fix.patch b/community/warmux/gcc-fix.patch
new file mode 100644
index 000000000..d4ceb0746
--- /dev/null
+++ b/community/warmux/gcc-fix.patch
@@ -0,0 +1,25 @@
+## i-love-you-lordheavy.patch [diff]
+diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
+--- warmux-11.04/lib/warmux/action/action.cpp	2011-04-28 21:03:14.000000000 +0200
++++ warmux-11.04-new/lib/warmux/action/action.cpp	2012-01-29 09:51:16.680251815 +0100
+@@ -81,7 +81,7 @@
+ }
+ 
+ // Build an action from a network packet
+-Action::Action(const char *buffer, DistantComputer* _creator)
++Action::Action(char *buffer, DistantComputer* _creator)
+ {
+   m_creator = _creator;
+ 
+diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
+--- warmux-11.04/lib/warmux/include/WARMUX_action.h	2011-04-28 21:03:13.000000000 +0200
++++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h	2012-01-29 09:52:14.246921833 +0100
+@@ -168,7 +168,7 @@
+   Action(Action_t type, Double value1, Double value2);
+ 
+   // Build an action from a network packet
+-  Action(const char* buffer, DistantComputer* _creator);
++  Action(char* buffer, DistantComputer* _creator);
+ 
+   ~Action();
+ 
diff --git a/community/warmux/include-zlib.patch b/community/warmux/include-zlib.patch
new file mode 100644
index 000000000..c7e77aba1
--- /dev/null
+++ b/community/warmux/include-zlib.patch
@@ -0,0 +1,11 @@
+diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
+--- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
++++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
+@@ -25,6 +25,7 @@
+ #include <SDL_image.h>
+ #include <SDL_rotozoom.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "graphic/surface.h"
+ #include "tool/math_tools.h"
-- 
cgit v1.2.3-54-g00ecf