From 3cd89eb224257a4f43e18973a7f11263fa393dc2 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Thu, 23 Apr 2015 06:31:17 +0200
Subject: games/warmux: Added a patch to explicitly include zlib header.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 games/warmux/gcc47.patch                |  9 ---------
 games/warmux/patches/gcc47.patch        |  9 +++++++++
 games/warmux/patches/include-zlib.patch | 11 +++++++++++
 games/warmux/warmux.SlackBuild          |  4 +++-
 4 files changed, 23 insertions(+), 10 deletions(-)
 delete mode 100644 games/warmux/gcc47.patch
 create mode 100644 games/warmux/patches/gcc47.patch
 create mode 100644 games/warmux/patches/include-zlib.patch

(limited to 'games/warmux')

diff --git a/games/warmux/gcc47.patch b/games/warmux/gcc47.patch
deleted file mode 100644
index e51801a369..0000000000
--- a/games/warmux/gcc47.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur warmux-11.04.orig/tools/list_games/main.cpp warmux-11.04/tools/list_games/main.cpp
---- warmux-11.04.orig/tools/list_games/main.cpp	2011-04-28 21:03:12.000000000 +0200
-+++ warmux-11.04/tools/list_games/main.cpp	2012-04-01 10:03:27.752999997 +0200
-@@ -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/games/warmux/patches/gcc47.patch b/games/warmux/patches/gcc47.patch
new file mode 100644
index 0000000000..e51801a369
--- /dev/null
+++ b/games/warmux/patches/gcc47.patch
@@ -0,0 +1,9 @@
+diff -Naur warmux-11.04.orig/tools/list_games/main.cpp warmux-11.04/tools/list_games/main.cpp
+--- warmux-11.04.orig/tools/list_games/main.cpp	2011-04-28 21:03:12.000000000 +0200
++++ warmux-11.04/tools/list_games/main.cpp	2012-04-01 10:03:27.752999997 +0200
+@@ -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/games/warmux/patches/include-zlib.patch b/games/warmux/patches/include-zlib.patch
new file mode 100644
index 0000000000..c7e77aba11
--- /dev/null
+++ b/games/warmux/patches/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/games/warmux/warmux.SlackBuild b/games/warmux/warmux.SlackBuild
index 1d711e8373..a360b817ca 100644
--- a/games/warmux/warmux.SlackBuild
+++ b/games/warmux/warmux.SlackBuild
@@ -73,7 +73,9 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix building with gcc-4.7.x
-patch -p1 < $CWD/gcc47.patch
+patch -p1 < $CWD/patches/gcc47.patch
+# Explicitly include zlib headers
+patch -p1 < $CWD/patches/include-zlib.patch
 # Fix for sdlnet
 sed -i "s|SDLNet_Read32(buffer)|SDLNet_Read32(const_cast<char*>(buffer))|" \
   lib/warmux/action/action.cpp
-- 
cgit v1.2.3-65-gdbad