summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2006-02-26 06:17:59 +0000
committerMark Loeser <halcy0n@gentoo.org>2006-02-26 06:17:59 +0000
commita4646d8b8bb43dcf83add57b4a482caf44df845a (patch)
tree35161c5d4305cc49c68bad072165d00db37494e8 /games-strategy
parentMarked stable on mips. (diff)
downloadgentoo-2-a4646d8b8bb43dcf83add57b4a482caf44df845a.tar.gz
gentoo-2-a4646d8b8bb43dcf83add57b4a482caf44df845a.tar.bz2
gentoo-2-a4646d8b8bb43dcf83add57b4a482caf44df845a.zip
Add patch to fix compilation with gcc-4.1 by Konrad Campowsky <frollen AT cs DOT tu-berlin DOT de>; bug #120078
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/wormux/ChangeLog7
-rw-r--r--games-strategy/wormux/Manifest9
-rw-r--r--games-strategy/wormux/files/wormux-0.5.1-gcc41.patch12
-rw-r--r--games-strategy/wormux/wormux-0.5.1.ebuild7
4 files changed, 29 insertions, 6 deletions
diff --git a/games-strategy/wormux/ChangeLog b/games-strategy/wormux/ChangeLog
index a98b30c3231b..b323b4d244a0 100644
--- a/games-strategy/wormux/ChangeLog
+++ b/games-strategy/wormux/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-strategy/wormux
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/ChangeLog,v 1.5 2006/02/23 22:49:58 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/ChangeLog,v 1.6 2006/02/26 06:17:59 halcy0n Exp $
+
+ 26 Feb 2006; Mark Loeser <halcy0n@gentoo.org>
+ +files/wormux-0.5.1-gcc41.patch, wormux-0.5.1.ebuild:
+ Add patch to fix compilation with gcc-4.1 by Konrad Campowsky <frollen AT cs
+ DOT tu-berlin DOT de>; bug #120078
23 Feb 2006; <Tupone@gentoo.org> wormux-0.5.1.ebuild:
Modular X dependency fix
diff --git a/games-strategy/wormux/Manifest b/games-strategy/wormux/Manifest
index 98790847cd52..0ce91e2403b0 100644
--- a/games-strategy/wormux/Manifest
+++ b/games-strategy/wormux/Manifest
@@ -4,9 +4,12 @@ SHA256 e5a1a2ef2b7e27fcbae1ad6626021ea6afa3ef6fa259fd5565fa66f7ca66dc66 ChangeLo
MD5 e485e3a4a60562c01b0420109aca1592 files/digest-wormux-0.5.1 259
RMD160 a15f603c1a788a61074c9814e21705d294e29cbf files/digest-wormux-0.5.1 259
SHA256 c1f683e2171dedd14084dce474ba272b21f2689703b5da32478408fbacc4232b files/digest-wormux-0.5.1 259
+MD5 47b6e6e5200a6d52cabd26804d587558 files/wormux-0.5.1-gcc41.patch 557
+RMD160 ca6a40fb5449569ffd748bdb2383a689d7e40aa2 files/wormux-0.5.1-gcc41.patch 557
+SHA256 d2be5422a4f30ed7f10376e4ad7f711229db0e9c29b816584d6a6a35a832099e files/wormux-0.5.1-gcc41.patch 557
MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 59f8b5ece66ff03039d677d3c7920848 wormux-0.5.1.ebuild 985
-RMD160 5c33451c02cb7f0b44b1d2d444f7bf953d6a50c7 wormux-0.5.1.ebuild 985
-SHA256 122d2a4bc6d43ab12687b3add4c99f96f57331d404017bb590eb5af3429e42bc wormux-0.5.1.ebuild 985
+MD5 67db646b7d9ad928af730731654e3d50 wormux-0.5.1.ebuild 1026
+RMD160 46c65b15d14886ef54657136eaaf0f3a372d37a9 wormux-0.5.1.ebuild 1026
+SHA256 0f1540c1586fe26c277d9de75cde9cef786b9b21cea33a7a1a4152539f3e3fc9 wormux-0.5.1.ebuild 1026
diff --git a/games-strategy/wormux/files/wormux-0.5.1-gcc41.patch b/games-strategy/wormux/files/wormux-0.5.1-gcc41.patch
new file mode 100644
index 000000000000..5f82f73747a7
--- /dev/null
+++ b/games-strategy/wormux/files/wormux-0.5.1-gcc41.patch
@@ -0,0 +1,12 @@
+--- src/tool/xml_document.h.orig 2006-01-23 20:09:23.000000000 +0100
++++ src/tool/xml_document.h 2006-01-23 20:10:02.000000000 +0100
+@@ -43 +43 @@
+- static bool LitDocXml::LitListeString (const xmlpp::Node *x,
++ static bool LitListeString (const xmlpp::Node *x,
+--- src/map/maps_list.h.orig 2006-01-23 20:10:20.000000000 +0100
++++ src/map/maps_list.h 2006-01-23 20:10:37.000000000 +0100
+@@ -54,2 +54,2 @@
+- CL_Surface &InfoTerrain::LitImgTerrain();
+- CL_Surface &InfoTerrain::LitImgCiel();
++ CL_Surface &LitImgTerrain();
++ CL_Surface &LitImgCiel();
diff --git a/games-strategy/wormux/wormux-0.5.1.ebuild b/games-strategy/wormux/wormux-0.5.1.ebuild
index 2de2334ad31d..2959579bd13b 100644
--- a/games-strategy/wormux/wormux-0.5.1.ebuild
+++ b/games-strategy/wormux/wormux-0.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/wormux-0.5.1.ebuild,v 1.2 2006/02/23 22:49:58 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wormux/wormux-0.5.1.ebuild,v 1.3 2006/02/26 06:17:59 halcy0n Exp $
inherit eutils games
@@ -21,7 +21,10 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
- cd ${S}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-gcc41.patch
+
if use nls ; then
sed -i \
-e '/^localedir =/s:=.*:=/usr/share/locale:' \