Fix building with glibc-2.10, bug #273518

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 94 insertions, 11 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index b971b67369d6..a5c6814defce 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/visualboyadvance
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.34 2008/11/17 20:36:42 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.35 2009/06/13 15:50:14 nyhm Exp $
+
+  13 Jun 2009; Tristan Heaven <nyhm@gentoo.org>
+  visualboyadvance-1.7.2-r2.ebuild,
+  +files/visualboyadvance-1.7.2-glibc2.10.patch:
+  Fix building with glibc-2.10, bug #273518
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/1.7.2-gcc41.patch, files/visualboyadvance-1.7.2-uninit.patch:
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index 848d637b586a..cd6d821cdc21 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -5,16 +5,17 @@ AUX 1.7.2-gcc34.patch 1354 RMD160 6a3764040df0e166ca7c9e984bd6553264685460 SHA1
 AUX 1.7.2-gcc41.patch 1441 RMD160 bb1ddefb515022876c1ad7479b4308be4b77fab7 SHA1 531384f5d8e7f6c39951a5c946de12de618a309e SHA256 ec5f42182e6daabe560d3437ca0f95054dc5355dd32a972f923d8ba98bba88e6
 AUX 1.7.2-homedir.patch 415 RMD160 c617252b5cf61a829bd25c4821c684791ac9c58e SHA1 4458dbb1b111356c22b46c84266c48cab5238c00 SHA256 c49ac18ac3a71355bc7fb790da176a45fe558d4e4f08366045d34f8c801cc05c
 AUX visualboyadvance 634 RMD160 e98a182e2df04b452fee68240c8bf1b6a34472a2 SHA1 964410cb7c92803dcf1ce442ac6dffa758a5388f SHA256 60cef94c41f16d9865d174be6174922db192173c143d6bcc1cae4b25f932cb34
+AUX visualboyadvance-1.7.2-glibc2.10.patch 1827 RMD160 0d1d604dae7fd8e577eb594ca89706e9bfdd5380 SHA1 d6edb74cd539813b2899c5e1bd950e44f8fae2d9 SHA256 74d202288274b21210cbde5a59c56d92562151c8871223ae38f0497e69e950bc
 AUX visualboyadvance-1.7.2-uninit.patch 530 RMD160 2fdb59ba6038290f5e50339ff489e04a5070de77 SHA1 4eb9a2d4f098fad9e87bfd8447b2707cc622b3a4 SHA256 ba2d6f3dde29a40616b566770c215caa23353f7e8b1e44053c6299727c9402af
 DIST VisualBoyAdvance-src-1.7.2.tar.gz 1410762 RMD160 44f94a4f270f2cda25879681c52892f6978caf99 SHA1 04d82406079563fd17cda07f72488185e9152f51 SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7
 DIST visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2 2892 RMD160 48ffe6634bd2407eef688e13dff56b645fa95339 SHA1 d05d162544aec4e346e2d4a259b6594dd12e0475 SHA256 cf61ddf1e806d3c3152a7102414929d96614319a84481333a9fca7dc640dd74b
-EBUILD visualboyadvance-1.7.2-r2.ebuild 1990 RMD160 d4979e6a7ddffe11d06ba564970727c6566be08d SHA1 9fa443307b436fdd37d593813e5e0e15972a2307 SHA256 0fca246fbca8a85dddd3c8b264b06d26f15c746a2928d3a23dfaafb3682d3ee2
-MISC ChangeLog 5456 RMD160 2ba318a00279074f1dd7b898ea19f38a7719d729 SHA1 4ad3de9b49ad2a0632aae5ae4bf82d03d2c24b03 SHA256 496230df549d587e1e59c75742d50e31ee5995087a8ad2de1af3d9eaf278189d
+EBUILD visualboyadvance-1.7.2-r2.ebuild 2027 RMD160 6fcfd532b1dd1d30619a0540b18a5743ed4545b3 SHA1 c4c7a5b17edf003d386b7569d63eefd261ed9dd1 SHA256 68c3e4be85c9d6965879ff07d1ed26ec7b34f88e290f68e024caa1300cc5b60a
+MISC ChangeLog 5629 RMD160 2776156fada62d8252f2eb42b6ea8303bc98596d SHA1 1755c9db926543b2c668c1029e8a7b812b8f7b40 SHA256 a2f34b6ff5d90c56e846ce03382eab7bddc2706971ad8be8c1edac51f6125b53
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkkh1d8ACgkQAiZjviIA2XhSKgCfRBHQsCuSBkiFOTp4qGHYsScC
-xtgAoJqZppr2P5gCA2c0D6ZnkfR1aJ+Q
-=j+jq
+iEYEARECAAYFAkozyrwACgkQdz7hIScOURF7twCgriMEvmdz0vjQXOPZedPYOgXW
+VJAAoPX6+uJ8jM0Nu9jSlhrfOqBT3Q+e
+=X1qb
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-glibc2.10.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-glibc2.10.patch
new file mode 100644
index 000000000000..5211b362350e
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-glibc2.10.patch
@@ -0,0 +1,76 @@
+--- src/GBA.cpp
++++ src/GBA.cpp
+@@ -1130,7 +1130,7 @@
+ bool CPUIsZipFile(const char * file)
+ {
+   if(strlen(file) > 4) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+ 
+     if(p != NULL) {
+       if(_stricmp(p, ".zip") == 0)
+@@ -1145,7 +1145,7 @@
+ {
+   cpuIsMultiBoot = false;
+   if(strlen(file) > 4) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+ 
+     if(p != NULL) {
+       if(_stricmp(p, ".gba") == 0)
+@@ -1169,7 +1169,7 @@
+ bool CPUIsGBABios(const char * file)
+ {
+   if(strlen(file) > 4) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+ 
+     if(p != NULL) {
+       if(_stricmp(p, ".gba") == 0)
+@@ -1189,7 +1189,7 @@
+ bool CPUIsELF(const char *file)
+ {
+   if(strlen(file) > 4) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+     
+     if(p != NULL) {
+       if(_stricmp(p, ".elf") == 0)
+--- src/Util.cpp
++++ src/Util.cpp
+@@ -478,7 +478,7 @@
+ {
+   cpuIsMultiBoot = false;
+   if(strlen(file) > 4) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+ 
+     if(p != NULL) {
+       if(_stricmp(p, ".gba") == 0)
+@@ -502,7 +502,7 @@
+ bool utilIsGBImage(const char * file)
+ {
+   if(strlen(file) > 4) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+ 
+     if(p != NULL) {
+       if(_stricmp(p, ".gb") == 0)
+@@ -522,7 +522,7 @@
+ bool utilIsZipFile(const char *file)
+ {
+   if(strlen(file) > 4) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+ 
+     if(p != NULL) {
+       if(_stricmp(p, ".zip") == 0)
+@@ -552,7 +552,7 @@
+ bool utilIsGzipFile(const char *file)
+ {
+   if(strlen(file) > 3) {
+-    char * p = strrchr(file,'.');
++    const char * p = strrchr(file,'.');
+ 
+     if(p != NULL) {
+       if(_stricmp(p, ".gz") == 0)
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
index 3ecde3041e4d..732f70447bcd 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild,v 1.2 2008/05/02 21:34:30 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild,v 1.3 2009/06/13 15:50:14 nyhm Exp $
 
 inherit eutils flag-o-matic games
 
@@ -50,7 +50,8 @@ src_unpack() {
 		"${FILESDIR}"/${PV}-gcc34.patch \
 		"${FILESDIR}"/${PV}-gcc41.patch \
 		"${WORKDIR}"/${P}-deprecatedsigc++.patch \
-		"${FILESDIR}"/${P}-uninit.patch
+		"${FILESDIR}"/${P}-uninit.patch \
+		"${FILESDIR}"/${P}-glibc2.10.patch
 }
 
 src_compile() {