summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2011-09-19 19:45:57 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2011-09-19 19:45:57 +0000
commitbde94045d6d6709f33c8ef5a969be331cdcdab65 (patch)
tree3c7ac6c4796e956fe35bac9939f8e7dfd0ea6e30 /games-strategy
parentInitial import. Dependency of forthcoming faraday_middleware. (diff)
downloadgentoo-2-bde94045d6d6709f33c8ef5a969be331cdcdab65.tar.gz
gentoo-2-bde94045d6d6709f33c8ef5a969be331cdcdab65.tar.bz2
gentoo-2-bde94045d6d6709f33c8ef5a969be331cdcdab65.zip
add patch to work with newer zlib (bug #383595) submitted by Martin Jansa
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/warmux/ChangeLog6
-rw-r--r--games-strategy/warmux/files/warmux-11.04.1-zlib.patch11
-rw-r--r--games-strategy/warmux/warmux-11.04.1.ebuild6
3 files changed, 20 insertions, 3 deletions
diff --git a/games-strategy/warmux/ChangeLog b/games-strategy/warmux/ChangeLog
index ed0518f576f5..4043d619e673 100644
--- a/games-strategy/warmux/ChangeLog
+++ b/games-strategy/warmux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/warmux
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/ChangeLog,v 1.8 2011/08/01 19:04:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/ChangeLog,v 1.9 2011/09/19 19:45:57 mr_bones_ Exp $
+
+ 19 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> warmux-11.04.1.ebuild,
+ +files/warmux-11.04.1-zlib.patch:
+ add patch to work with newer zlib (bug #383595) submitted by Martin Jansa
01 Aug 2011; Markus Meier <maekke@gentoo.org> warmux-11.04.1.ebuild:
amd64/x86 stable, bug #375379
diff --git a/games-strategy/warmux/files/warmux-11.04.1-zlib.patch b/games-strategy/warmux/files/warmux-11.04.1-zlib.patch
new file mode 100644
index 000000000000..c7e77aba11c8
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-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-strategy/warmux/warmux-11.04.1.ebuild b/games-strategy/warmux/warmux-11.04.1.ebuild
index 1921ce6d8608..53d62f21e520 100644
--- a/games-strategy/warmux/warmux-11.04.1.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/warmux-11.04.1.ebuild,v 1.2 2011/08/01 19:04:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/warmux-11.04.1.ebuild,v 1.3 2011/09/19 19:45:57 mr_bones_ Exp $
EAPI=2
inherit autotools eutils games
@@ -33,7 +33,9 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/${PN}-11.04
src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch \
+ "${FILESDIR}"/${P}-gentoo.patch \
+ "${FILESDIR}"/${P}-zlib.patch
eautoreconf
}