gcc4 compile patch from Avuton Olrich (bug #119024)

(Portage version: 2.0.53)

3 files changed, 54 insertions, 7 deletions

diff --git a/games-emulation/gens/ChangeLog b/games-emulation/gens/ChangeLog
index d33994ec67a8..e73535275ead 100644
--- a/games-emulation/gens/ChangeLog
+++ b/games-emulation/gens/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/gens
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/ChangeLog,v 1.13 2005/09/26 17:45:07 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/ChangeLog,v 1.14 2006/01/15 03:37:52 mr_bones_ Exp $
+
+  15 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gens-2.12b-gcc4.patch, gens-2.12b.ebuild:
+  gcc4 compile patch from Avuton Olrich (bug #119024)
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> gens-2.12b.ebuild:
   Making games last on inherit line.
diff --git a/games-emulation/gens/files/gens-2.12b-gcc4.patch b/games-emulation/gens/files/gens-2.12b-gcc4.patch
new file mode 100644
index 000000000000..88cf9b0e6f54
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.12b-gcc4.patch
@@ -0,0 +1,37 @@
+diff --git a/src/gens/emulator/g_main.c b/src/gens/emulator/g_main.c
+index 1c9f4f5..3ac13eb 100644
+--- a/src/gens/emulator/g_main.c
++++ b/src/gens/emulator/g_main.c
+@@ -5,6 +5,7 @@
+ #include <sys/stat.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "g_main.h"
+ #include "timer.h"
+ #include "gens.h"
+diff --git a/src/gens/emulator/g_main.h b/src/gens/emulator/g_main.h
+index c7ea4b2..9090766 100644
+--- a/src/gens/emulator/g_main.h
++++ b/src/gens/emulator/g_main.h
+@@ -36,6 +36,8 @@ extern char **language_name;
+ extern unsigned char Keys[];
+ extern unsigned char joystate[];
+ 
++static int Build_Language_String (void);
++
+ void SetWindowText(const char *text);
+ 
+ int Set_Render(int Full, int Num, int Force);
+diff --git a/src/gens/emulator/parse.c b/src/gens/emulator/parse.c
+index 5bece4a..67f8b49 100644
+--- a/src/gens/emulator/parse.c
++++ b/src/gens/emulator/parse.c
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <getopt.h>
++#include <string.h>
+ #include "port.h"
+ #include "save.h"
+ #include "cpu_68k.h"
diff --git a/games-emulation/gens/gens-2.12b.ebuild b/games-emulation/gens/gens-2.12b.ebuild
index fa9bdffba000..c272dad56aec 100644
--- a/games-emulation/gens/gens-2.12b.ebuild
+++ b/games-emulation/gens/gens-2.12b.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/gens-2.12b.ebuild,v 1.4 2005/09/26 17:45:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/gens-2.12b.ebuild,v 1.5 2006/01/15 03:37:52 mr_bones_ Exp $
 
-inherit eutils games
+inherit flag-o-matic eutils games
 
 DESCRIPTION="A Sega Genesis/CD/32X emulator"
 HOMEPAGE="http://gens.consolemul.com/"
@@ -13,14 +13,20 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-RDEPEND="virtual/libc
-	>=media-libs/libsdl-1.2
+RDEPEND=">=media-libs/libsdl-1.2
 	>=x11-libs/gtk+-2.4"
 DEPEND="${RDEPEND}
 	>=dev-lang/nasm-0.98"
 
 S=${WORKDIR}/GensForLinux
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+	append-ldflags -Wl,-z,noexecstack
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BUGS README