Add patch to fix compilation with gcc-4.1 by Konrad Campowsky <frollen AT cs DOT tu-berlin DOT de>; bug #120082

Package-Manager: portage-2.1_pre4-r1

4 files changed, 44 insertions, 4 deletions

diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index 736be962b924..82c6a697bd85 100644
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/widelands
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.8 2006/01/13 13:57:58 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.9 2006/02/26 06:44:28 halcy0n Exp $
+
+  26 Feb 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/widelands-0.0.9.5-gcc41.patch, widelands-0.0.9.5.ebuild:
+  Add patch to fix compilation with gcc-4.1 by Konrad Campowsky <frollen AT cs
+  DOT tu-berlin DOT de>; bug #120082
 
   13 Jan 2006; Stefan Schweizer <genstef@gentoo.org>
   +files/widelands-makefile.patch, widelands-0.0.9.5.ebuild:
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 259e540df7c4..15dabed29159 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,8 +1,37 @@
-MD5 dce2db2eab4e474da124eac11c867db0 ChangeLog 1762
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 21aa6af72ab1070529fb43231a484104 ChangeLog 1993
+RMD160 bbba8c6fa16db05a82135066176e6f5cf18df13b ChangeLog 1993
+SHA256 9d9c5c4028844f2eb88b1596c8d6ce92db23fce36e6ee617265026d857808928 ChangeLog 1993
 MD5 4de0ba8b5543e6d848c86838244852e6 files/digest-widelands-0.0.9 73
+RMD160 bff7ad9f11f0245e35d3346af8907a0d2daf2f97 files/digest-widelands-0.0.9 73
+SHA256 b5f227568c42e069523b3060f2316936e05acba6a14a1c7de9ae53487175595f files/digest-widelands-0.0.9 73
 MD5 47800deda03f6db9034d766478dd4cec files/digest-widelands-0.0.9.5 78
+RMD160 f6c06790f44095a08bc5738b0f7d0b3d722fed4e files/digest-widelands-0.0.9.5 78
+SHA256 379d68f3ff8b36820a02f44c31d50d22033bdd8b3ab7760b23d5f2a7ae69364f files/digest-widelands-0.0.9.5 78
 MD5 839d74b86a5e329cbfb77e61c65d6921 files/widelands-0.0.9-amd64.patch 425
+RMD160 02a4dcb0c0bb5d962df8347ee4cb6804ac08b3bd files/widelands-0.0.9-amd64.patch 425
+SHA256 878939c6809b5de1e530d4770a9efd8ca309cd45d985e261b566ff159922d3b3 files/widelands-0.0.9-amd64.patch 425
+MD5 2ddf9d093211e7c32be95beff1ad6951 files/widelands-0.0.9.5-gcc41.patch 304
+RMD160 17d3a6486dfb78f6aa69c8fb90ec6809cb7d462e files/widelands-0.0.9.5-gcc41.patch 304
+SHA256 92516fb795fa01fb87cff443fe37b86c4e2680f79ea60adee87c08bffe014acf files/widelands-0.0.9.5-gcc41.patch 304
 MD5 3d7e00feeebcd47a5bf3ca35e1d5fe7e files/widelands-makefile.patch 728
+RMD160 1df21cf0a8f511d9fbe0edc516b3193ee507bd32 files/widelands-makefile.patch 728
+SHA256 a9f1db93b6f620e3185e8e9760c98a75b89062bc901a028f0fbecb11550bd6bc files/widelands-makefile.patch 728
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 4b18f8da16ce62bd31ee3a2fc91a5bab widelands-0.0.9.5.ebuild 1508
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 5371d06d8b89769075a903837dc711f0 widelands-0.0.9.5.ebuild 1560
+RMD160 2a75bfc8fa42644f8a5de9f2743e1034f6026a77 widelands-0.0.9.5.ebuild 1560
+SHA256 b45fcccfa22cd893f750a25ce7967ce359dac503be860028eb80ded7bf39cf9a widelands-0.0.9.5.ebuild 1560
 MD5 5973bcdbf97557cad2aaa063f7ba32e0 widelands-0.0.9.ebuild 1169
+RMD160 9aba54ccf891405d14c8ee7153f18f197526bb9e widelands-0.0.9.ebuild 1169
+SHA256 d956dd842d82e5490b1389124e72e3601985a3705ff81da0d405cc92e367cb45 widelands-0.0.9.ebuild 1169
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEAU6ICRZPokWLroQRAjroAJ0SB0AbO9mEW8d9GGXwyCUT+znpfQCeOld4
+240RPuvFUL6pzhbPOXEca/4=
+=6I23
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/widelands/files/widelands-0.0.9.5-gcc41.patch b/games-strategy/widelands/files/widelands-0.0.9.5-gcc41.patch
new file mode 100644
index 000000000000..493eaf029f41
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.0.9.5-gcc41.patch
@@ -0,0 +1,5 @@
+--- src/ui/ui_fs_menus/fullscreen_menu_options.h.orig	2006-01-23 21:12:33.000000000 +0100
++++ src/ui/ui_fs_menus/fullscreen_menu_options.h	2006-01-23 21:22:31.000000000 +0100
+@@ -66 +66 @@
+-	Options_Ctrl::Options_Struct Fullscreen_Menu_Options::get_values();
++	Options_Ctrl::Options_Struct get_values();
diff --git a/games-strategy/widelands/widelands-0.0.9.5.ebuild b/games-strategy/widelands/widelands-0.0.9.5.ebuild
index e424acfdf3dd..750b6364fe34 100644
--- a/games-strategy/widelands/widelands-0.0.9.5.ebuild
+++ b/games-strategy/widelands/widelands-0.0.9.5.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/widelands/widelands-0.0.9.5.ebuild,v 1.7 2006/01/13 13:57:58 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.9.5.ebuild,v 1.8 2006/02/26 06:44:28 halcy0n Exp $
 
 inherit eutils games flag-o-matic
 
@@ -29,6 +29,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/widelands-0.0.9-amd64.patch"
 	epatch "${FILESDIR}/widelands-makefile.patch"
+	epatch "${FILESDIR}/widelands-0.0.9.5-gcc41.patch"
 	sed -i -e "s:__ppc__:__PPC__:g" "${S}/src/machdep.h" || die "sed failed"
 }