Fix build with gcc-4.7 Bug #427760

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

4 files changed, 65 insertions, 17 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index 69d4d2e8d0bb..0507172674a9 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/visualboyadvance
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.43 2012/06/29 12:49:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.44 2012/07/24 07:56:41 tupone Exp $
+
+  24 Jul 2012; Tupone Alfredo <tupone@gentoo.org>
+  visualboyadvance-1.7.2-r3.ebuild, +files/visualboyadvance-1.7.2-gcc47.patch:
+  Fix build with gcc-4.7 Bug #427760 by flameeyes@gentoo.org
 
   29 Jun 2012; Brent Baude <ranger@gentoo.org>
   visualboyadvance-1.7.2-r3.ebuild:
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index 9b858519186f..f70d570d0912 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -1,15 +1,26 @@
-AUX 1.7.2-gcc34.patch 1354 RMD160 6a3764040df0e166ca7c9e984bd6553264685460 SHA1 8e4b8f2abb93119c0fd7576bff981cf0d771076c SHA256 82c4ec3170fc982eaf5665c44ce2b767868d81f522adf45325df4a7a680d9ac5
-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-1.7.2-glibc2.10.patch 1827 RMD160 0d1d604dae7fd8e577eb594ca89706e9bfdd5380 SHA1 d6edb74cd539813b2899c5e1bd950e44f8fae2d9 SHA256 74d202288274b21210cbde5a59c56d92562151c8871223ae38f0497e69e950bc
-AUX visualboyadvance-1.7.2-libpng15.patch 230 RMD160 b75ae02c13c872959efe1e6c01ed5f1efc67cdd0 SHA1 2745f29042c78f471660ebd4c0dbd9d932284632 SHA256 5715dd370b8ca891b81f3b0c7dd53dd08bf297964fbfeb0bf032244e525c5618
-AUX visualboyadvance-1.7.2-ovflfix.patch 368 RMD160 696033358f8a5ab02d7b4cea0a69297524d27cca SHA1 8db91f206ddf22e07dfdd6c8457cce1e2e4d193c SHA256 8768ed788210362a367b13cff2794379ec2b2058ba5cc61228bae0519c80277a
-AUX visualboyadvance-1.7.2-uninit.patch 530 RMD160 2fdb59ba6038290f5e50339ff489e04a5070de77 SHA1 4eb9a2d4f098fad9e87bfd8447b2707cc622b3a4 SHA256 ba2d6f3dde29a40616b566770c215caa23353f7e8b1e44053c6299727c9402af
-AUX visualboyadvance-1.7.2-zlib-1.2.6.patch 532 RMD160 15564d910e81160157b3b3cac698657dfd03d9a3 SHA1 6c34f6d35235bafa6f84ab39462031ff26f3161f SHA256 2a853ad88a5a7ff1af61ea9e798243ab642bf92fffb63d72b736e5c763f921e4
-AUX visualboyadvance-1.7.2-zlib.patch 4367 RMD160 56cb490856d5e6c602b334064f968d7d6b250ab8 SHA1 a56314ef4dd06d20e14310c617c022ea0604d085 SHA256 c1928b1b32a71b6112816746dd8c4019c957500701020042f460379272c2f571
-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 2069 RMD160 0fad3635b1694d1f8c5889de5daa69c40cce8822 SHA1 9f9e0726108c0700cf365f586ab0acccad972614 SHA256 679db59e3093858ca3e394983f22068c741ce1f3cfeb661c92a248ededb7fda5
-EBUILD visualboyadvance-1.7.2-r3.ebuild 2191 RMD160 6fdf5662a9c9b58719034e421aee0dce7d294f5a SHA1 8402548abce9fda6597eabcb41731dd5edb30a52 SHA256 cc9c49da6d2b9b530d1af53ada4d5d4d83373d8763b41bc8d88dc0a96cfd1313
-MISC ChangeLog 6969 RMD160 c585b985e80715d0ebcd87d04ed1813b6132d357 SHA1 d031e82794a0d344a210bbb1715cffa15e286c7e SHA256 895cac861693996c8975678614da9c954c8c173afa8647ade2e636032029613b
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 1.7.2-gcc34.patch 1354 SHA256 82c4ec3170fc982eaf5665c44ce2b767868d81f522adf45325df4a7a680d9ac5 SHA512 6c95b0bf3b5a24593ed7fdd9868f9d47979089c00d85029912399768ce49226b7a38f770c7b7b6d84930a284345668d113646d5a9b27f0012bf2c250aad84c6f WHIRLPOOL f6a663a39bc403ba542befb4901ed8f668bb409ad019f33d22cb47609eef863674482184501174ce14864f100e83f5c4935cd46dc845acdc3bb930c96329b4d9
+AUX 1.7.2-gcc41.patch 1441 SHA256 ec5f42182e6daabe560d3437ca0f95054dc5355dd32a972f923d8ba98bba88e6 SHA512 15423cd1e88eb7d3e6afad33bfd535924f02257af84b700ae376627a3a4efef0aa7b6989b4f74600518e6e35722685b1dd053565c88253772fca811c2ab13bd2 WHIRLPOOL fadaa7124ed8c533615bc75bd3b44d10400d0745ee13cd6be9a0cd699034f1b1d532a717f0d446c9c7438514f56f08122d635c740c1cce43dcedee6b5d448928
+AUX 1.7.2-homedir.patch 415 SHA256 c49ac18ac3a71355bc7fb790da176a45fe558d4e4f08366045d34f8c801cc05c SHA512 af63932ba7882f4472d74f01fea2d6947a37efaa7efbdc5cc4d66d4ca66806a5e408092382a2dfb135280080648de6eda59d9f6817c3a25460956918c485baa9 WHIRLPOOL 892de23a4e87f59a0fc653acbcc7bf05a2dd02796550dc45c957ef0adc80e5fa5d175298b592243568404102d04082f0c892ce8e46218aab25509f627d5fdf59
+AUX visualboyadvance-1.7.2-gcc47.patch 1029 SHA256 702da6d4d1635c3e239e9f3f0c906b3386f63d6c60778f3a6d607edca5952db7 SHA512 46f85340f71f07adfabf526fba4f31ade272353c39d367d858b750cd1f471716fc22651ac6b9ab26f9225d781d74378d0905ac3cfaafa8d16a68eb6147a3ad39 WHIRLPOOL 2330e0d8a666c6d1bf2d46746ee4dd3138b3e29bab38104563ff7203623c50abde6e4d80a766c3ad3d476b2759ad2631959f82b627f4de24350ca56d0c3b6ebd
+AUX visualboyadvance-1.7.2-glibc2.10.patch 1827 SHA256 74d202288274b21210cbde5a59c56d92562151c8871223ae38f0497e69e950bc SHA512 381870684d9dddc425e9817ff840c6aa44b22f9edb19b6b61fd763589317de20c28660a135553b097b2d4188fea28a1a94361d3fe8793b8519aadee0f083a0b9 WHIRLPOOL 0665d2219df17ac52e4372ef71782cbee92b9c4ec8f5f6df70dcb7723de8038ce97dca70a6c105835a3da8f3e9ecc4e4fbb70a6a5d74bc5631358eaaaf122f1c
+AUX visualboyadvance-1.7.2-libpng15.patch 230 SHA256 5715dd370b8ca891b81f3b0c7dd53dd08bf297964fbfeb0bf032244e525c5618 SHA512 cdd99c66ca6c7a500c2a8c7b38dcb6d4491c102cf6925ce6ce28c0ab4a4d25678a07d4a3d6b2b368bdaec941ef9f6da78602bf3a23dfbed643c920751b2c7731 WHIRLPOOL 2e2053cd4dbfb75c5b74004a71cfae753e2d6f04f64319f2383dd211a6ab4b1329961f0200ee50ca95e02faf9e7a9c75b1a316c5d6956031af45d3d24f538a26
+AUX visualboyadvance-1.7.2-ovflfix.patch 368 SHA256 8768ed788210362a367b13cff2794379ec2b2058ba5cc61228bae0519c80277a SHA512 7faaad33a14a7c8a1da7246a881de444bf074d8f86fc6b71026f4e5c330612a3fd3aa386247e3cbd1858034692ab80fc559b51e3246d5ad2a6ea0ce09fa8886c WHIRLPOOL d0b45237454752836894bd10880d7214d99608a55f745ae8dd00997a1045fb05f405b1292b606a0c538f5c8601eed06e734619a4a72f17c16a383a50d5a3dcca
+AUX visualboyadvance-1.7.2-uninit.patch 530 SHA256 ba2d6f3dde29a40616b566770c215caa23353f7e8b1e44053c6299727c9402af SHA512 d777a8a8a76e80c363b2cdac2c373b6784a6a821aa2a008905f6c396686d78b61efebb85cc5511b5d68584c0d1a959a1bec6b7cd0391193e7205c9276642c295 WHIRLPOOL fb2a9bc3b2524af48ada8056e4dbb5ff6742e4779a1f600bfc8ddcd4fdc196fec984ba11b03dd4f576edcf9fbdf1f63981c9552bb5b1bce34b0f5ce80def74ea
+AUX visualboyadvance-1.7.2-zlib-1.2.6.patch 532 SHA256 2a853ad88a5a7ff1af61ea9e798243ab642bf92fffb63d72b736e5c763f921e4 SHA512 0946736c98305975ca0af6bc2c4468e7f36b22bcedb8e2b15cb7a933fd7fcd1bcaafda2d4974669e7b6d42f8c4e19a8e4212e98038743bc20ec204f03eb42f3e WHIRLPOOL c0cf26fbbce3cf3cc5df1bc0464cee3c553cdfa27738d352b9e1e1b2f548a810cbdff57c3491de679fdddab5828c21cce1b1797efd7eb63532e4e2b99e53ead5
+AUX visualboyadvance-1.7.2-zlib.patch 4367 SHA256 c1928b1b32a71b6112816746dd8c4019c957500701020042f460379272c2f571 SHA512 d6628b1313e3a86a0d2bb4322cbbbcaa0775fc74e48665892cfd5e58705001a5ba38fbb7040bccb1b30a27608a9425edbab35e5c84ee836cafb3d78bc5f50437 WHIRLPOOL 866e8c36c11a00e07672cf88dbd2e93fd62cc33b561942e1d0984bbe52d6a9c4f8277b13bd0af838e4a674b158772c786d537f1311ccbf4a4f46a77b9f53f077
+DIST VisualBoyAdvance-src-1.7.2.tar.gz 1410762 SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7 SHA512 58066cb438683c342c292c620cc87d9f2dff2b96849c46ff4c720146de5c7fb743588e42cd8de73e57866d4a191ccdadeab16da5e51da5a138199cc93ec4c932 WHIRLPOOL 05e8409f1d24022fc50ef44da462b6cc7866fa82b7de66c9cc68270912105e457a6ceeae7cb43476ae62a55c533a8e80c58d404d58cfb3b5e23b137f999c854b
+DIST visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2 2892 SHA256 cf61ddf1e806d3c3152a7102414929d96614319a84481333a9fca7dc640dd74b SHA512 420df630d5472c1f1f84eb27741e059ca340300f82747f1c03cf8e6931f2cd6658df2e1e32ad5f3ac2bac4a9769e7aa48399463d4d080fc91b929e956b198ad0 WHIRLPOOL 7db1965baf94626fa0f2bb7627d9afefa6531782a4a43d9812edecb25b5f8b719ca740a6425ce574ff6d917ea8bc8f4e3d6ce35450d93b123f95c2588401d29a
+EBUILD visualboyadvance-1.7.2-r2.ebuild 2069 SHA256 679db59e3093858ca3e394983f22068c741ce1f3cfeb661c92a248ededb7fda5 SHA512 cb33b3f22d3153e1b53434f1ff3b575306050db2a85a734ee9abee446e09a83c97064fb4eccd92775ac73408cfb65b2afc362e25db15d907139c8f2e1d90d14f WHIRLPOOL 329d526e8c4955e944a90bbd5b05da8969f427e2bcec1ef13faf242a5257e2831d681a9cdb739bfb27612439042c772d86ef7ea3bb4b85a7a1027af4b227c241
+EBUILD visualboyadvance-1.7.2-r3.ebuild 2226 SHA256 0bc945b0b8d20164af137628e00ff958c903db3977cc82f3e4dfeace1e9a9b18 SHA512 f318d293297320b01729ea0c97a1bd3bfc57ed9f02cad617b294141fe1ec2ca844aa9486312a1f63365de3a895a0b37fce06ae72a55d5861c96a94af2babf998 WHIRLPOOL 52fd8cf0c4dcfb6c65846884b4913cc56b8c300bc40ed7ea40f81feb34b59d997c901961455eec77fc0ef4fd1316b883971d9cb440bd8f6df779ec10eac7de95
+MISC ChangeLog 7160 SHA256 d012174cc6c544f75bb5860debb7c48c7400710b37f8682252e42b68f90f07aa SHA512 e02ea55ba3c1f76c3036db5357e96429dcd58e18f6f2db1092e5670d056bb2628ab612f7b583496393fb5b12bdd865b3e548e0982bce7652de003a24a6fca803 WHIRLPOOL d4023f881ecf23293af10c92aa708d78cedd46b1c5c10f2f39161b9619e9372de80dff66c9d478d114bec6c316706ac8826c0a4781f906a7285cd100f22a7709
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAOVUUACgkQIY77eQFFFC16vQCg4forSrhBteGK5hHDsrB3CE09
+iZMAn0zUfm5/Bo/VVPblgnNh4sglTQH1
+=vwNl
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-gcc47.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-gcc47.patch
new file mode 100644
index 000000000000..816122f7f263
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-gcc47.patch
@@ -0,0 +1,32 @@
+--- src/sdl/debugger.cpp.old	2012-07-24 09:01:55.062533139 +0200
++++ src/sdl/debugger.cpp	2012-07-24 09:03:31.927731884 +0200
+@@ -1280,7 +1280,8 @@
+   if(n == 2) {
+     u32 addr = 0;
+     sscanf(args[1], "%x", &addr);
+-    for(int i = 0; i < 16; i++) {
++    int i;
++    for(i = 0; i < 16; i++) {
+       int a = debuggerReadByte(addr);
+       int b = debuggerReadByte(addr+1);
+       int c = debuggerReadByte(addr+2);
+@@ -1316,7 +1317,8 @@
+     u32 addr = 0;
+     sscanf(args[1], "%x", &addr);
+     addr = addr & 0xfffffffe;
+-    for(int i = 0; i < 16; i++) {
++    int i;
++    for(i = 0; i < 16; i++) {
+       int a = debuggerReadByte(addr);
+       int b = debuggerReadByte(addr+1);
+       int c = debuggerReadByte(addr+2);
+@@ -1352,7 +1354,8 @@
+     u32 addr = 0;
+     sscanf(args[1], "%x", &addr);
+     addr = addr & 0xfffffffc;
+-    for(int i = 0; i < 16; i++) {
++    int i;
++    for(i = 0; i < 16; i++) {
+       int a = debuggerReadByte(addr);
+       int b = debuggerReadByte(addr+1);
+       int c = debuggerReadByte(addr+2);
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild
index bff5cb551ac0..fb6d887f78ad 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r3.ebuild,v 1.6 2012/06/29 12:49:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild,v 1.7 2012/07/24 07:56:41 tupone Exp $
 
 EAPI=2
 inherit eutils flag-o-matic autotools games
@@ -42,6 +42,7 @@ src_prepare() {
 		"${FILESDIR}"/${PV}-homedir.patch \
 		"${FILESDIR}"/${PV}-gcc34.patch \
 		"${FILESDIR}"/${PV}-gcc41.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
 		"${WORKDIR}"/${P}-deprecatedsigc++.patch \
 		"${FILESDIR}"/${P}-uninit.patch \
 		"${FILESDIR}"/${P}-glibc2.10.patch \