Fix build with gcc-4.4.0

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 29 insertions, 8 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index 0b8a9af5bc1c..ed09d7b6a30d 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/snes9x
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.31 2008/02/09 06:22:47 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.32 2009/06/05 07:13:58 tupone Exp $
+
+  05 Jun 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/snes9x-1.43-gcc440.patch, snes9x-1.43-r2.ebuild:
+  Fix build with gcc-4.4.0 and removed wrong --with-screenshot argument to
+  configure. All for version 1.43.
 
   09 Feb 2008; Michael Sterrett <mr_bones_@gentoo.org> snes9x-1.51.ebuild:
   enhance license
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index d334d1440186..9ad6f0d57805 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -2,6 +2,7 @@ AUX nojoy.patch 507 RMD160 cc341aa07cc1ea707e66c864dd8fd5ee0234cb0c SHA1 19c467c
 AUX snes9x-1.43-build.patch 1104 RMD160 9a5502223a1f052d6c30f61293f6bb5cd36a0dd3 SHA1 5676d726da0a6b1d69b020c288029a140c5f44ca SHA256 40912ece42780e53259f60aa53f6cf69e49c9d6b6d17839ef06608bcac32868a
 AUX snes9x-1.43-config.patch 371 RMD160 9d16c5ca51901b6c5abbdf1b025dfced4a9e96a7 SHA1 0768d9068b2a7c3dc9599227014895615fde320d SHA256 0a99f13b0c58a78feca200c301a24dd09ebfb3aee99e74229870bd8728f93952
 AUX snes9x-1.43-gcc412.patch 627 RMD160 9dc49ebfb8f212633f672acf803f905e0fd9b475 SHA1 97ba7a8474c6d6b55ffe15892358c523378090e4 SHA256 e41de369da57997b1163d79af87d1e27b62aad389184887721b39554969c37e9
+AUX snes9x-1.43-gcc440.patch 431 RMD160 14bffbacbbf1e5b0580247a1c976d3412216ce43 SHA1 3384c3b995d32eed4956911aefd2085eff1c8a6b SHA256 44c1dbaa922521fbf4923f5388f3c7247838d97becbf726c4cc027cc99f6af13
 AUX snes9x-1.43-key-bindings-fix.patch 2526 RMD160 d1dd054cf8f7f637c759ed7cd82dfb7511a0629d SHA1 e9992f6550d9420d9e6da74be78828f366025ed8 SHA256 22a6df46d15438aaaeddc5f86564474988f810037d2810da4773ff365f907b77
 AUX snes9x-1.43-porting.patch 1903 RMD160 b95939f656e669dcca1df0fb5bd584e40ba6eba2 SHA1 a057eb6493ee81d4720ee343b11e3aa17dfb76dd SHA256 a38fedbd355487ac0ff28a79a39e108bd0063446befc4d5081a707f944bed286
 AUX snes9x-1.51-build.patch 497 RMD160 6db003d87d71392e45aaf8388b89068f545af3f7 SHA1 a448d6ae07ce9455b069f5d269c07a4ef15f7853 SHA256 2e1c87802b9022c901f6ee7c940e767ddbcbdb300e532e75e77a6a02a6dfd6c8
@@ -10,7 +11,7 @@ AUX snes9x-1.51-opengl.patch 3265 RMD160 372edbbdcad3091c7f3dbdc43bfa661da11df9e
 AUX snes9x-1.51-x11.patch 4297 RMD160 40998bbd623779dd6160ebd98a542f7e1d3c97cb SHA1 464066c638d80168fb904544256150f66b6ec1df SHA256 edc568083e20ba99698f500f60bcb6f0ffe4c84dd772d6ec9aa0c47918ed8787
 DIST snes9x-1.43-src.tar.gz 1016251 RMD160 d2003f7afb208109405b41f4eec586b93518f9b2 SHA1 c6883c451aeb442030862ec19a8dca25ee02d82c SHA256 cb60baaeabc28b68f7dfc8fd54453f6268b66aae33ea64eb1788c19df09be6f1
 DIST snes9x-1.51-src.tar.bz2 1707256 RMD160 5813405b05f181224614f95e8ba3c309f79e1b36 SHA1 a0de23fb376463d27f4e8fc7f11424bd3c598585 SHA256 70c8f41fc7f1e000605127e0f4261e3eb52c72019b3cbf9bc8061b0b8ccdf687
-EBUILD snes9x-1.43-r2.ebuild 2815 RMD160 153c03c36cef9511ea5b8db00a539e5bb8efc01b SHA1 94aa63240996daa48d10814d755f9de9348f9255 SHA256 8ed82e408ae0c49f52ac05a911c85ce7db11f52f0027062497a7445e10370144
+EBUILD snes9x-1.43-r2.ebuild 2806 RMD160 52295918ca64f3132bb69a1a2bc84200a782d0e7 SHA1 b85911bc9b522c30f2f8f3df349f11a5dc409def SHA256 35600aef9bc85fc6597a47971abb1feb423f486de646712419888f0feddbfe88
 EBUILD snes9x-1.51.ebuild 2794 RMD160 2b1d10339273d0f90c5596d85b55ed807df6f2b5 SHA1 e6b2df84d78c31f2a0dcd46e5e8452388241bc4e SHA256 fdf58f9189ae9f3e3c6b068d569bffacbe2abb588f34172863d5dd6fad329b84
-MISC ChangeLog 5835 RMD160 b16f7bdde3ec21b3b63445da54a790b9426143fc SHA1 f9f9f3f317a0c7557177f290c240880fb63e7846 SHA256 d03438151323b9a941dc87b31f55b2be86864ce944e9c8607b718f991d871cc9
+MISC ChangeLog 6051 RMD160 f3d399a0f847b52ac803b0369c46cb2b5e969529 SHA1 d7b658e0400d1f4ddd324e4c053ec48d98881e5b SHA256 b0b8790686634aded0467b1988af6fa79022c888c1bd1416235680d043cc4b09
 MISC metadata.xml 264 RMD160 ce2073cceaf823ec0243794e7774cd652f7ec925 SHA1 afc7d1160eaff0253192dc6592e1665eec1093e4 SHA256 0c52501f31b9f073402cbb17d00926c8e19a6638625c7d452279396b0297890b
diff --git a/games-emulation/snes9x/files/snes9x-1.43-gcc440.patch b/games-emulation/snes9x/files/snes9x-1.43-gcc440.patch
new file mode 100644
index 000000000000..b0905c3d8468
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.43-gcc440.patch
@@ -0,0 +1,16 @@
+--- unix/unix.cpp.old	2009-06-05 08:52:45.000000000 +0200
++++ unix/unix.cpp	2009-06-05 08:54:31.000000000 +0200
+@@ -1131,11 +1131,11 @@
+ {
+     *drive = 0;
+ 
+-    char *slash = strrchr (path, '/');
++    const char *slash = strrchr (path, '/');
+     if (!slash)
+ 	slash = strrchr (path, '\\');
+ 
+-    char *dot = strrchr (path, '.');
++    const char *dot = strrchr (path, '.');
+ 
+     if (dot && slash && dot < slash)
+ 	dot = NULL;
diff --git a/games-emulation/snes9x/snes9x-1.43-r2.ebuild b/games-emulation/snes9x/snes9x-1.43-r2.ebuild
index bec7ea89a6a0..5d6d1019b444 100644
--- a/games-emulation/snes9x/snes9x-1.43-r2.ebuild
+++ b/games-emulation/snes9x/snes9x-1.43-r2.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.43-r2.ebuild,v 1.4 2007/10/09 14:40:41 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.43-r2.ebuild,v 1.5 2009/06/05 07:13:58 tupone Exp $
 
 # 3dfx support (glide) is disabled because it requires
 # glide-v2 while we only provide glide-v3 in portage
 # http://bugs.gentoo.org/show_bug.cgi?id=93097
 
-WANT_AUTOCONF=latest
 inherit autotools eutils flag-o-matic multilib games
 
 DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
@@ -47,6 +46,7 @@ src_unpack() {
 		"${FILESDIR}"/${P}-key-bindings-fix.patch \
 		"${FILESDIR}"/${P}-build.patch \
 		"${FILESDIR}"/${P}-gcc412.patch \
+		"${FILESDIR}"/${P}-gcc440.patch \
 		"${FILESDIR}"/${P}-config.patch
 
 	sed -i \
@@ -90,7 +90,6 @@ src_compile() {
 			$(use_with joystick) \
 			$(use_with debug debugger) \
 			$(use_with zlib) \
-			--with-screenshot \
 			$(use_with dga extensions) \
 			|| die
 		# Makefile doesnt quite support parallel builds