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
commita985b2115c1b5100acb5f9997f5d746ae4ad3f42 (patch)
tree0be0fcd8e393096607f2170cffd6ede12bbcb785 /games-strategy/warmux
parentInitial import. Dependency of forthcoming faraday_middleware. (diff)
downloadhistorical-a985b2115c1b5100acb5f9997f5d746ae4ad3f42.tar.gz
historical-a985b2115c1b5100acb5f9997f5d746ae4ad3f42.tar.bz2
historical-a985b2115c1b5100acb5f9997f5d746ae4ad3f42.zip
add patch to work with newer zlib (bug #383595) submitted by Martin Jansa
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'games-strategy/warmux')
-rw-r--r--games-strategy/warmux/ChangeLog6
-rw-r--r--games-strategy/warmux/Manifest15
-rw-r--r--games-strategy/warmux/files/warmux-11.04.1-zlib.patch11
-rw-r--r--games-strategy/warmux/warmux-11.04.1.ebuild6
4 files changed, 23 insertions, 15 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/Manifest b/games-strategy/warmux/Manifest
index d55b6517660b..14882fcee53e 100644
--- a/games-strategy/warmux/Manifest
+++ b/games-strategy/warmux/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX warmux-11.01-gentoo.patch 2357 RMD160 52739232b3e687f6bad7d89d030d131883edc4eb SHA1 de55cb4dc0f1360e64222ea4dfb402a8d8e2cd2e SHA256 3e6c4ede46abc92291a4a51a37334e2c67fba15579a34bb6d4f2044b01966897
AUX warmux-11.04.1-gentoo.patch 1543 RMD160 4d702cb6d36f7cf71b6e64668190fe6715c76f9d SHA1 70a13794d40c1e1b22befc5dfcddf209c9226594 SHA256 ddaf2c688f58cf8fb9d0baddd4016ebbf04c974ab533ebc0c3532ee87799d643
+AUX warmux-11.04.1-zlib.patch 416 RMD160 8bd946de5adfed33b3f3c3613a9f461c2e6c4cec SHA1 9415c23c11f1fed76a4f687935da108da5d3e7fd SHA256 665c4a64e54478491284f6cb6251bd58f96ba81671a7c439cffe175b86462852
DIST warmux-11.01.tar.bz2 110379327 RMD160 85a7bbfed5ca2ccbd793a12d7ea548948a747a88 SHA1 18e5d5bf144f069405c75ff8fe51296d9a7871a5 SHA256 f06171958ad26b142b039844789d578168451665a8594820750f81a5941f06b8
DIST warmux-11.04.1.tar.bz2 110083622 RMD160 badd055d0e10e364cfa140a76f39ec0956c674c0 SHA1 375dbeb43a56a047daa4fcea49a9802f4b308795 SHA256 789c4f353e4c5ce0a2aba2e82861d3fd0e5218bc76d8da1a332f2c7b1b27e4ee
EBUILD warmux-11.01.ebuild 1495 RMD160 536e778adf78c681ee3430ea3163d9fa77f0d3ba SHA1 a1604793edcea0dd14f17d1a4bb452520f0c9361 SHA256 f0bad4dfa8d5187efb324bd63934ac9bdf31f1bd02b58da949e5d266d639e114
-EBUILD warmux-11.04.1.ebuild 1526 RMD160 be9b01e7221132342a0144711916fa6a5550ddf5 SHA1 634843e928642285eb41451cc02c39b42044acc6 SHA256 0a4ed20db16970c93cde87b8cae774ecbca1bd3f9685eda351f0ccb8cdfcbd07
-MISC ChangeLog 7831 RMD160 d3c3d8a4e5a44192e4766def2361ad1372e6fad9 SHA1 313411a45253aedf1910ffe66ab084099e53b0d4 SHA256 f7b83f65972792d9a53503908b8b9e8b2966780dc0edeb0f8091942c9358c98e
+EBUILD warmux-11.04.1.ebuild 1567 RMD160 7f0a3dd4f9ad4607c99b0fb9ba7fbc7c5cab373c SHA1 4f3d25f525a5474a0b1d05b4687f4feb063a20f0 SHA256 e89507f929da6807e61f6afb7feaa2ccdbc670692ef5ba00a387975e164ba0a4
+MISC ChangeLog 8025 RMD160 f8588f58b809e69160b1cd9bd5bbe06f49b6b9b1 SHA1 368b56cbd43b73201c92364b2095b4de4690e032 SHA256 ae776b111057a2d7b5c70a9b015e62ce70d8d515fd468977a83de4d9bb68131a
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk42+QEACgkQkKaRLQcq0GJbdQCgtiEWLKdkMTt2YF6vw3CAwTvH
-C1kAoJeAheqyIyRxPF8WUlypUMa4cOzL
-=/iox
------END PGP SIGNATURE-----
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
}