From d9e71b0af79928c747fcba94a59fabd054b63285 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 9 May 2016 17:37:39 +0200
Subject: [PATCH] Add warmux

---
 warmux/default/PKGBUILD           | 49 +++++++++++++++++++++++++++++++
 warmux/default/gcc-fix.patch      | 36 +++++++++++++++++++++++
 warmux/default/include-zlib.patch | 11 +++++++
 warmux/default/return-null.patch  | 11 +++++++
 4 files changed, 107 insertions(+)
 create mode 100644 warmux/default/PKGBUILD
 create mode 100644 warmux/default/gcc-fix.patch
 create mode 100644 warmux/default/include-zlib.patch
 create mode 100644 warmux/default/return-null.patch

diff --git a/warmux/default/PKGBUILD b/warmux/default/PKGBUILD
new file mode 100644
index 00000000..c7bd9e49
--- /dev/null
+++ b/warmux/default/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: arthurzam
+# Contributor: carstene1ns <url/mail: arch carsten-teibes de>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: pukyxd
+# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Martchus <martchus@gmx.net>
+
+pkgname=warmux
+pkgver=11.04.1
+pkgrel=8.1
+pkgdesc="Clone of turn-based artillery games like Scorched Earth or Worms (formerly known as Wormux)"
+arch=('i686' 'x86_64')
+url="http://gna.org/projects/warmux/"
+license=('GPL')
+depends=('libxml++' 'sdl_image' 'sdl_gfx' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl' 'gcc-libs' 'libxml2')
+replaces=('wormux' 'warmux-data')
+conflicts=('warmux-data')
+source=("http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'include-zlib.patch'
+        'gcc-fix.patch'
+        'return-null.patch')
+sha256sums=('789c4f353e4c5ce0a2aba2e82861d3fd0e5218bc76d8da1a332f2c7b1b27e4ee'
+            '665c4a64e54478491284f6cb6251bd58f96ba81671a7c439cffe175b86462852'
+            '3f271dc6249ababe919733268c34464fc3050fc7c2b0329e9017f1b32c7760f5'
+            '0e0692fb2acc5697c3083deeff41dcdb055f3330cbac146ebab4aa0f021ad03c')
+
+prepare() {
+  cd "$pkgname-${pkgver/.1/}"
+
+  # libpng fix
+  patch -Np1 < ../include-zlib.patch
+  # compilation fixes
+  patch -Np1 < ../gcc-fix.patch
+  patch -Np0 < ../return-null.patch
+}
+
+build() {
+  cd "$pkgname-${pkgver/.1/}"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$pkgname-${pkgver/.1/}"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/warmux/default/gcc-fix.patch b/warmux/default/gcc-fix.patch
new file mode 100644
index 00000000..1ac476b9
--- /dev/null
+++ b/warmux/default/gcc-fix.patch
@@ -0,0 +1,36 @@
+## 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();
+ 
+Description: Fix FTBFS with gcc 4.7.
+Author: Felix Geyer <debfx-pkg@fobos.de>
+
+--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
++++ warmux-11.04.1+repack/tools/list_games/main.cpp
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <unistd.h>
+ #include <WARMUX_types.h>
+ #include <WARMUX_network.h>
+ #include <WARMUX_index_server.h>
diff --git a/warmux/default/include-zlib.patch b/warmux/default/include-zlib.patch
new file mode 100644
index 00000000..c7e77aba
--- /dev/null
+++ b/warmux/default/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"
diff --git a/warmux/default/return-null.patch b/warmux/default/return-null.patch
new file mode 100644
index 00000000..851dfcbd
--- /dev/null
+++ b/warmux/default/return-null.patch
@@ -0,0 +1,11 @@
+--- src/interface/weapon_menu.cpp.orig	2016-05-09 15:22:36.895266463 +0200
++++ src/interface/weapon_menu.cpp	2016-05-09 15:21:38.518476191 +0200
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+   if (!show)
+-    return false;
++    return NULL;
+   const std::vector<PolygonItem *>& items = poly->GetItem();
+   WeaponMenuItem * tmp;
+   Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);