diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-07-24 07:56:41 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-07-24 07:56:41 +0000 |
| commit | 04b0637b18288b595698e0449b5589ddd411cce4 (patch) | |
| tree | fc70201f5ddbab54bfddad3d2d3d82f5a3f1e5d6 /games-emulation/visualboyadvance | |
| parent | Version bump to latest. Drop newer/older. (diff) | |
| download | gentoo-2-04b0637b18288b595698e0449b5589ddd411cce4.tar.gz gentoo-2-04b0637b18288b595698e0449b5589ddd411cce4.tar.bz2 gentoo-2-04b0637b18288b595698e0449b5589ddd411cce4.zip | |
Fix build with gcc-4.7 Bug #427760
(Portage version: 2.1.11.9/cvs/Linux i686)
Diffstat (limited to 'games-emulation/visualboyadvance')
3 files changed, 39 insertions, 2 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/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 \ |