build with newer gcc (bug #406471) with patch from Markus Rathgeb

Package-Manager: portage-2.1.10.44/cvs/Linux i686

4 files changed, 26 insertions, 17 deletions

diff --git a/games-emulation/fceux/ChangeLog b/games-emulation/fceux/ChangeLog
index 10b9a91d835d..e337de54910b 100644
--- a/games-emulation/fceux/ChangeLog
+++ b/games-emulation/fceux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/fceux
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/ChangeLog,v 1.14 2011/08/01 19:15:07 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/ChangeLog,v 1.15 2012/03/12 19:12:43 mr_bones_ Exp $
+
+  12 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> fceux-2.1.5.ebuild,
+  +files/fceux-2.1.5-gcc46.patch:
+  build with newer gcc (bug #406471) with patch from Markus Rathgeb
 
   01 Aug 2011; Markus Meier <maekke@gentoo.org> fceux-2.1.5.ebuild:
   amd64/x86 stable, bug #375715
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 4734f11baa7c..2fdb7288da43 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fceux-2.1.4a-ovflfix.patch 618 RMD160 38db2f73ae9641f64559f4db6b5d0899f853a8d9 SHA1 9ad948318fd9b57cd409ba385ed3d7486dfcf838 SHA256 8284f8041d5b9a91cf54be2970df06b8568446a2b235cb16761326e9a3ff152c
 AUX fceux-2.1.4a-underlink.patch 427 RMD160 4d7b5faa5470cea3c239f49463210aa7eb7d0c3d SHA1 0c4f75bb0aea9ca93bac7a8aa8cb4b807ada0a8a SHA256 08a27728b7f836b612b944b2f305e479abd9553e9193515f430ea9c2b2dbb8d6
+AUX fceux-2.1.5-gcc46.patch 421 RMD160 688b2449c1b1a0e1a06dba3c4311a29a7ed68648 SHA1 4318f5d6c9539b2645fc3a0f8ca205f58d1dd601 SHA256 f068a6fbf66559e725894174fc6266e5840df3e2673f16c84047be9094c2e937
 AUX fceux-2.1.5-underlink.patch 475 RMD160 d8aa691406ef5a8dba6e65fa7b993a7c58433e4b SHA1 0a53bbc1def6ecf63e52e34f3420f866312c2ac2 SHA256 e8910db9095b8a988a4dea8babd746d9d3c9243cecbb7f9b029ef98058c3df7d
 DIST fceux-2.1.4a.src.tar.bz2 5083564 RMD160 c36723db343050f90a923869918596b7092cf1f5 SHA1 5297c873d8de397538869ea8b23816d457d13add SHA256 267aef2cf05c510f66eca8330060c495a3c18ad22c73bda42df73d8d8330df3a
 DIST fceux-2.1.5.src.tar.bz2 7322199 RMD160 9852e6f0958d0ec8d926257e78b34579ef10af85 SHA1 599ef6a261ab1bd24e58468886d7cc303e150feb SHA256 ee6b1ee6a0347e325032f6655a5caa289e2b0458f7fccddccd5137f1cd63bf9f
 EBUILD fceux-2.1.4a.ebuild 1423 RMD160 435d33f925fe37eb8b23a3f526f14eac9509588c SHA1 f110559dcf169a3fa507b65ad2230f4d56fab8a8 SHA256 4ad109aeab4f905cda1bca27d1f02cda432a9d5e915e5feef0c5422bc36d9afb
-EBUILD fceux-2.1.5.ebuild 1385 RMD160 c0968b2c220e83974fe6c05665ba9b0923ed723e SHA1 4460fb927d06d314a30b508069bd859a3b55b830 SHA256 bd5a3313c967f9677101c02892bb18bfe99019b15f26ddeacc6031cb5b3c84ce
-MISC ChangeLog 2045 RMD160 5130591c5ca9c201784f63cb01c686560bf77f98 SHA1 c941e04491c2b419049354da5d189a95e96d4d0a SHA256 7747f315c2233492e73e13843d5fa917467b91ab669ff550c145ba2a90cb5e02
+EBUILD fceux-2.1.5.ebuild 1427 RMD160 bf6d6aceb9bc0feb060fa92fcb9ee4056cb6cd88 SHA1 d053a7dd2f0667ce8a7d3d791a70ce7f01d29ac5 SHA256 b55584d3fc5e46480633e460369cb4b94ff91f05bb20b582a4171fa17190db81
+MISC ChangeLog 2226 RMD160 017840e34fda0e2a5ffc1248a77ba953fb377117 SHA1 ea26d7567da4a1a3e04efbc6356fe2f1bb0be23d SHA256 23dbbb15719503ad8db182823d3ade23df0e2e97e6969fb6b747eb5ef113e23f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk42+2QACgkQkKaRLQcq0GIUzgCbBhgufgULn4Frgct8FuauKYzt
-tCYAn2HNzFuecD/v29aCYs6iWikDWjSu
-=F76T
------END PGP SIGNATURE-----
diff --git a/games-emulation/fceux/fceux-2.1.5.ebuild b/games-emulation/fceux/fceux-2.1.5.ebuild
index 4d7d05b0a465..738d3b190d39 100644
--- a/games-emulation/fceux/fceux-2.1.5.ebuild
+++ b/games-emulation/fceux/fceux-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/fceux-2.1.5.ebuild,v 1.2 2011/08/01 19:15:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/fceux-2.1.5.ebuild,v 1.3 2012/03/12 19:12:43 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils scons-utils games
@@ -26,7 +26,9 @@ RDEPEND="lua? ( dev-lang/lua )
 S=${WORKDIR}/fceu${PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlink.patch
+	epatch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-gcc46.patch
 	# mentioned in bug #335836
 	if ! use lua ; then
 		sed -i -e '/_S9XLUA_H/d' SConstruct || die
diff --git a/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch b/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
new file mode 100644
index 000000000000..90dacf4bb4a8
--- /dev/null
+++ b/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
@@ -0,0 +1,12 @@
+diff -Naur a/fceu2.1.5/src/file.cpp b/fceu2.1.5/src/file.cpp
+--- a/fceu2.1.5/src/file.cpp	2010-09-19 00:05:09.000000000 +0000
++++ b/fceu2.1.5/src/file.cpp	2012-03-01 19:21:25.856204727 +0000
+@@ -310,7 +310,7 @@
+ 				if(magic==0x088b1f) {

+ 					 // maybe gzip... 

+ 

+-					void* gzfile = gzopen(fileToOpen.c_str(),"rb");

++					gzFile gzfile = gzopen(fileToOpen.c_str(),"rb");

+ 					if(gzfile) {

+ 						delete fp;

+