summaryrefslogtreecommitdiff
path: root/games/warmux
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2015-04-23 06:31:17 +0200
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit3cd89eb224257a4f43e18973a7f11263fa393dc2 (patch)
tree1a8eb191fd83444814e0531b08c437717dc27f07 /games/warmux
parent4582e825b1ed28d6ae527706d86474bcbb965768 (diff)
downloadslackbuilds-3cd89eb224257a4f43e18973a7f11263fa393dc2.tar.gz
games/warmux: Added a patch to explicitly include zlib header.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games/warmux')
-rw-r--r--games/warmux/patches/gcc47.patch (renamed from games/warmux/gcc47.patch)0
-rw-r--r--games/warmux/patches/include-zlib.patch11
-rw-r--r--games/warmux/warmux.SlackBuild4
3 files changed, 14 insertions, 1 deletions
diff --git a/games/warmux/gcc47.patch b/games/warmux/patches/gcc47.patch
index e51801a369..e51801a369 100644
--- a/games/warmux/gcc47.patch
+++ b/games/warmux/patches/gcc47.patch
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