add patch for building with gcc-4.3 submitted by Martin Väth via bug #218954

Package-Manager: portage-2.1.4.4

4 files changed, 48 insertions, 14 deletions

diff --git a/games-puzzle/fish-fillets/ChangeLog b/games-puzzle/fish-fillets/ChangeLog
index 011aa5a6e99d..6a626a789f9b 100644
--- a/games-puzzle/fish-fillets/ChangeLog
+++ b/games-puzzle/fish-fillets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/fish-fillets
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.28 2008/03/06 17:08:14 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.29 2008/04/24 02:01:31 mr_bones_ Exp $
+
+  24 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/fish-fillets-0.8.0-gcc43.patch, fish-fillets-0.8.0.ebuild:
+  add patch for building with gcc-4.3 submitted by Martin Väth via bug
+  #218954
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> fish-fillets-0.7.4.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
index ad1e17bb057f..d09317de9b2c 100644
--- a/games-puzzle/fish-fillets/Manifest
+++ b/games-puzzle/fish-fillets/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fish-fillets-0.8.0-gcc43.patch 750 RMD160 9217e12c2fcfbdf93d4865025e49631795ecc1ab SHA1 dfa3556c27e58b90e3060ed5eb0dbcc88656ed0b SHA256 7575fc599c9a77b2b3bb2670ec5920e99f73a2c9f3d71860c7dea7e715bb3ca8
 DIST fillets-ng-0.7.4.tar.gz 346022 RMD160 992c4a486d1986ca3a06f3b03bde281d3a46da15 SHA1 6caa8b9e04c27ec0cf0909704b24eefeaf5f0a58 SHA256 58a4fab8cd623aba438a4dbafe65eb2eb2f85de170652b2596cad134210f1ad7
 DIST fillets-ng-0.8.0.tar.gz 348492 RMD160 fecd7b28bd50cec9d4efa7410c6eaec896dad6e8 SHA1 f05c0906ac52c6b37efb03a87fd2fea27df3a416 SHA256 a3f67ddee70edcf07d5baeeefd8706d6421493626c2a859e2bceeeb0e82766a7
 DIST fillets-ng-data-0.7.4.tar.gz 97584418 RMD160 ee57945576476f777d3d55901b567d689f17bd98 SHA1 a604b18bf406de9aa2dfa1e2fe1abd477de1aba7 SHA256 60ecfca28814aacdf9dba188d10bc545d00644dc02285bff95760a2fcc5ca3a9
 DIST fillets-ng-data-0.8.0.tar.gz 103001773 RMD160 56e25f5ae8cdaafac47822796b52554f54729916 SHA1 f5714ece341e13989b9b893321b702a922911fd4 SHA256 b64aaf16f4388e253b66c1fd1a42df25d59f020c553e3880317bf1fac49fad56
 EBUILD fish-fillets-0.7.4.ebuild 1230 RMD160 211d18bbc14547f317f5e9837c9e4c2378473f26 SHA1 a7261bc0ac2cf3337feac01c4e22457406f38ba3 SHA256 f88eeeb6f022e8edaa92478f401532a1512e5f0c43b70125b0e974fac16c6008
-EBUILD fish-fillets-0.8.0.ebuild 1278 RMD160 91feaa52fb2b52a5b5477274439c5aa4ed67a962 SHA1 89d44ca6f59a86e23ab79551d9aab0ed5f520af8 SHA256 eddffcde8cb180da4a97bdd33a6fd59855da815eeaff9334c473fbea0da791c4
-MISC ChangeLog 4063 RMD160 b95cd001eccab93e8f0c88b022453427ec27264e SHA1 fccf65a1ae059b7e45c1d467ff54492bcf0ab9d0 SHA256 06df5b7fb1eb57d9039c429cc99b4114d2f74112a9439e1f0d70eaf0e030ee63
+EBUILD fish-fillets-0.8.0.ebuild 1359 RMD160 e1bcf8b5dc495ca4b374aaecdd4c2a97d2bbde17 SHA1 aacaf8624803ac90efb01d049c7e150c03681ef6 SHA256 502902adac696e7d96a42b4bf3774dda06a77ef9207f70863f38f0576b5bedea
+MISC ChangeLog 4274 RMD160 a601c34bdb9ceffe7d3262f91b7af4ac5ba39188 SHA1 a854c3562afffb82321576285481bb1b8a242421 SHA256 83fea170ad009c35d98bc090a81499588382627bdac8651b168c3d66bc3c5cb3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH0CT5V3J2n04EauwRAnnYAJ9gaOkEOipqqk7xDCJ4DTAN5qH0qwCgiBmI
-UwhIXX8xRKybDjbWOl9c4AM=
-=R3+P
------END PGP SIGNATURE-----
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.8.0-gcc43.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.8.0-gcc43.patch
new file mode 100644
index 000000000000..b81f207aa3bf
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.8.0-gcc43.patch
@@ -0,0 +1,32 @@
+--- src/gengine/OptionAgent.cpp
++++ src/gengine/OptionAgent.cpp
+@@ -23,7 +23,8 @@
+ #include "UnknownMsgException.h"
+ #include "minmax.h"
+ 
+-#include <string.h> //strlen
++#include <cstring> //strlen
++#include <cstdlib>
+ #include <locale.h> //setlocale
+ 
+ #ifndef LC_MESSAGES
+--- src/gengine/StringTool.cpp
++++ src/gengine/StringTool.cpp
+@@ -9,6 +9,7 @@
+ #include "StringTool.h"
+ 
+ #include <sstream>
++#include <cstdlib>
+ 
+ //-----------------------------------------------------------------
+ /**
+--- src/level/Landslip.cpp
++++ src/level/Landslip.cpp
+@@ -10,6 +10,7 @@
+ 
+ #include "Rules.h"
+ #include "minmax.h"
++#include <cstring>
+ 
+ //-----------------------------------------------------------------
+     Landslip::Landslip(const ModelList &models)
diff --git a/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild
index 698ae43eff3f..6ce9cb3e70ed 100644
--- a/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild,v 1.2 2008/01/18 02:56:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild,v 1.3 2008/04/24 02:01:31 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -26,6 +26,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/fillets-ng-${PV}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
 src_compile() {
 	egamesconf \
 		--datadir="${GAMES_DATADIR}/${PN}" \