Added GCC 4.1 patch from Andre Ryan <andreryan908@gmail.com> and closing bug #135346.

Package-Manager: portage-2.1.2_pre2-r8

4 files changed, 50 insertions, 13 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index 1cfd2fa5103e..19b860613884 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/visualboyadvance
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.28 2006/09/29 15:10:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.29 2006/10/13 17:12:32 wolf31o2 Exp $
+
+  13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/1.7.2-gcc41.patch:
+  Added GCC 4.1 patch from Andre Ryan <andreryan908@gmail.com> and closing bug
+  #135346.
 
   29 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -visualboyadvance-1.7.2.ebuild, visualboyadvance-1.7.2-r1.ebuild:
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index a8e3b665301d..f634c6251afd 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -5,6 +5,10 @@ AUX 1.7.2-gcc34.patch 1354 RMD160 6a3764040df0e166ca7c9e984bd6553264685460 SHA1
 MD5 04a0915b7a414f5065dfb2510cc5a677 files/1.7.2-gcc34.patch 1354
 RMD160 6a3764040df0e166ca7c9e984bd6553264685460 files/1.7.2-gcc34.patch 1354
 SHA256 82c4ec3170fc982eaf5665c44ce2b767868d81f522adf45325df4a7a680d9ac5 files/1.7.2-gcc34.patch 1354
+AUX 1.7.2-gcc41.patch 1445 RMD160 50ca8184ad16e86be8abcbf2dd9ce4ed3958f4c2 SHA1 010a8737e5f0eab2b200b7005db08aa348de79e2 SHA256 1178f0ca6590ed8f4156918ab143aa8b9bcc49a050ace391f5fe93d1b0015403
+MD5 139bedc9500277f7787eed14fb71ee99 files/1.7.2-gcc41.patch 1445
+RMD160 50ca8184ad16e86be8abcbf2dd9ce4ed3958f4c2 files/1.7.2-gcc41.patch 1445
+SHA256 1178f0ca6590ed8f4156918ab143aa8b9bcc49a050ace391f5fe93d1b0015403 files/1.7.2-gcc41.patch 1445
 AUX 1.7.2-homedir.patch 415 RMD160 c617252b5cf61a829bd25c4821c684791ac9c58e SHA1 4458dbb1b111356c22b46c84266c48cab5238c00 SHA256 c49ac18ac3a71355bc7fb790da176a45fe558d4e4f08366045d34f8c801cc05c
 MD5 ef02d9be59ab74afa9a8f12e17e359d4 files/1.7.2-homedir.patch 415
 RMD160 c617252b5cf61a829bd25c4821c684791ac9c58e files/1.7.2-homedir.patch 415
@@ -14,14 +18,14 @@ MD5 a0c26da0983eebc48c3ca83825dde876 files/visualboyadvance 631
 RMD160 c2cb3806fdfe83cb3e87de9a4c6ec6201b6bad5a files/visualboyadvance 631
 SHA256 1742ef8d37e5f46ee40611d3dee4e26fbdb5aa130c2456fd7108bfadcb25ca22 files/visualboyadvance 631
 DIST VisualBoyAdvance-src-1.7.2.tar.gz 1410762 RMD160 44f94a4f270f2cda25879681c52892f6978caf99 SHA1 04d82406079563fd17cda07f72488185e9152f51 SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7
-EBUILD visualboyadvance-1.7.2-r1.ebuild 1294 RMD160 1cb85519e987366959da0d420884994dc03f6192 SHA1 6157828050ce8e6d0c459576967df43d3efb4f9b SHA256 7325b369bf21fd427da34187f6f7e73e0768e1eaa1d035d60812d361b803d4e7
-MD5 2090ad96f6baec559e7997d52ad099b0 visualboyadvance-1.7.2-r1.ebuild 1294
-RMD160 1cb85519e987366959da0d420884994dc03f6192 visualboyadvance-1.7.2-r1.ebuild 1294
-SHA256 7325b369bf21fd427da34187f6f7e73e0768e1eaa1d035d60812d361b803d4e7 visualboyadvance-1.7.2-r1.ebuild 1294
-MISC ChangeLog 4507 RMD160 16a2fb1a29bb64045c8608500641473a981e979f SHA1 b09ff2136ec917e9d253f0a75e1328871733a238 SHA256 451a0531fe816c71a2dff11135e8050487c50d9a5ed7aa1688513847b13bb211
-MD5 835f0e50d31ce686614f1a48386af161 ChangeLog 4507
-RMD160 16a2fb1a29bb64045c8608500641473a981e979f ChangeLog 4507
-SHA256 451a0531fe816c71a2dff11135e8050487c50d9a5ed7aa1688513847b13bb211 ChangeLog 4507
+EBUILD visualboyadvance-1.7.2-r1.ebuild 1334 RMD160 ef8112591cb6f1ba81ae6695d30098968b16f341 SHA1 60a6705a9a69bec7222353febf06471365093558 SHA256 ca532fea90decba299fbe8d7328bf1c7f3e68193c678b7a34c28cd14d3ca699e
+MD5 181b039ea151f300f0204c1728e02ea3 visualboyadvance-1.7.2-r1.ebuild 1334
+RMD160 ef8112591cb6f1ba81ae6695d30098968b16f341 visualboyadvance-1.7.2-r1.ebuild 1334
+SHA256 ca532fea90decba299fbe8d7328bf1c7f3e68193c678b7a34c28cd14d3ca699e visualboyadvance-1.7.2-r1.ebuild 1334
+MISC ChangeLog 4680 RMD160 e57124d4116f58d5d328363b54b350bb3f835caf SHA1 7bd6680861634a382ab45bedd1e7d7cfc418903b SHA256 769fa65739e54f92cfd402763519d157702e36d9e32da15583c466ce70c6ec64
+MD5 10039dd88440bf081ec27c7c4b62559e ChangeLog 4680
+RMD160 e57124d4116f58d5d328363b54b350bb3f835caf ChangeLog 4680
+SHA256 769fa65739e54f92cfd402763519d157702e36d9e32da15583c466ce70c6ec64 ChangeLog 4680
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -32,7 +36,7 @@ SHA256 17c8c0a1c947b5f0ed452c3fa5ed0b1892f9c35ae1ec41d4bb0897d827e6b8b0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFHTeBkT4lNIS36YERArV4AKCbP+wr2M0LEZackMf8OheUYPCKWgCfUDxT
-abanWXPlwVP15m9UFWyXvPs=
-=UZZw
+iD8DBQFFL8kJkT4lNIS36YERAsXkAKCtDRxtKg5EYUCe1DoBrNqWyH2jDwCeINkW
+1XYf0l4bOyj1RQipLFp399Y=
+=e9bD
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/visualboyadvance/files/1.7.2-gcc41.patch b/games-emulation/visualboyadvance/files/1.7.2-gcc41.patch
new file mode 100644
index 000000000000..764e37652a69
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/1.7.2-gcc41.patch
@@ -0,0 +1,27 @@
+diff -ru /root/VisualBoyAdvance-1.7.2/src/prof/prof.cpp VisualBoyAdvance-1.7.2/src/prof/prof.cpp
+--- /root/VisualBoyAdvance-1.7.2/src/prof/prof.cpp	2004-05-14 00:31:58.000000000 +1000
++++ VisualBoyAdvance-1.7.2/src/prof/prof.cpp	2006-06-03 13:49:41.000000000 +1000
+@@ -266,7 +266,7 @@
+     for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) {
+       if(profWrite8(fd, GMON_TAG_CG_ARC) ||
+          profWrite32(fd, (u32)frompc) ||
+-         profWrite32(fd, (u32)tos[toindex].selfpc) ||
++         profWrite32(fd, (u32)(intptr_t)tos[toindex].selfpc) ||
+          profWrite32(fd, tos[toindex].count)) {
+         systemMessage(0, "mcount: arc");
+         fclose(fd);
+diff -ru /root/VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp
+--- /root/VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp	2004-05-14 00:13:14.000000000 +1000
++++ VisualBoyAdvance-1.7.2/src/sdl/debugger.cpp	2006-06-03 13:49:57.000000000 +1000
+@@ -950,9 +950,9 @@
+ {
+   u32 address = 0;
+   if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
+-    address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
++    address = 0x2000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&workRAM[0]);
+   else
+-    address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
++    address = 0x3000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&internalRAM[0]);
+ 
+   if(size == 2)
+     printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", 
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild
index e0fceeae3fd6..e5fafd25e269 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r1.ebuild,v 1.8 2006/09/29 15:10:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r1.ebuild,v 1.9 2006/10/13 17:12:32 wolf31o2 Exp $
 
 inherit eutils games flag-o-matic
 
@@ -31,6 +31,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PV}-homedir.patch"
 	epatch "${FILESDIR}/${PV}-gcc34.patch"
+	epatch "${FILESDIR}/${PV}-gcc41.patch"
 }
 
 src_compile() {