From: Daniel Goller <morfic@gentoo.org>
Date: Fri, 7 Jan 2005 21:11:14 +0000 (+0000)
Subject: fixed config dialog not working with gtk2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33832a9bc098a1ec13775d28ba1cae9cbd19ba81;p=gentoo.git

fixed config dialog not working with gtk2
---

diff --git a/games-emulation/mupen64-glN64/ChangeLog b/games-emulation/mupen64-glN64/ChangeLog
index 7c29263f7315..d344d81ed965 100644
--- a/games-emulation/mupen64-glN64/ChangeLog
+++ b/games-emulation/mupen64-glN64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64-glN64
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/ChangeLog,v 1.3 2005/01/07 10:44:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/ChangeLog,v 1.4 2005/01/07 21:11:13 morfic Exp $
+
+  07 Jan 2005; Daniel Goller <morfic@gentoo.org>
+  +files/mupen64-glN64-gtk2.patch, mupen64-glN64-0.4.1_rc2.ebuild:
+  Fixed config dialog problem with gtk2
 
 *mupen64-glN64-0.4.1_rc2 (05 Jan 2005)
 
diff --git a/games-emulation/mupen64-glN64/Manifest b/games-emulation/mupen64-glN64/Manifest
index add57f904dfc..e6a1db76da85 100644
--- a/games-emulation/mupen64-glN64/Manifest
+++ b/games-emulation/mupen64-glN64/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b8f36239182a7123c9e61fad2b89fd82 mupen64-glN64-0.4.1_pre1.ebuild 751
-MD5 1231191b558fd454884dd4d1c3f4e772 mupen64-glN64-0.4.1_rc2.ebuild 1000
-MD5 e1052c65744ad8390bf682768b450456 ChangeLog 1419
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 e0e2f9111004f21e197569c2bd419c8a files/digest-mupen64-glN64-0.4.1_rc2 68
+MD5 b8f36239182a7123c9e61fad2b89fd82 mupen64-glN64-0.4.1_pre1.ebuild 751
+MD5 751dea9138d004b91233644e0135f5f2 ChangeLog 1574
+MD5 c035c7d49f68da9d889da03a5d73c749 mupen64-glN64-0.4.1_rc2.ebuild 1038
 MD5 47f0e615c36a823f63220f4aec84d47f files/mupen64-glN64-compile.patch 1290
 MD5 9220d158fd6e0f37797eb2f7aae4c3c7 files/mupen64-glN64-noasm.patch 409
 MD5 d2f2bca612361154241f2b899673230e files/digest-mupen64-glN64-0.4.1_pre1 64
+MD5 e0e2f9111004f21e197569c2bd419c8a files/digest-mupen64-glN64-0.4.1_rc2 68
+MD5 7b7b92e1dd75295fa258e3f0e02d1d3c files/mupen64-glN64-gtk2.patch 808
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB3mgrI1lqEGTUzyQRAhHlAKDWLLwMH8o/bFOP2/UspcritGV6uACfXahB
-xHYHV4QTemfyvHShRP/qNiY=
-=yAsn
+iD8DBQFB3vs2UpKYMelfdYERAiRIAJ9Ht048Iv4aoXHCEisxSzcMuOx97QCeILtS
+og9m2MDtkJJaLQrMREe87tQ=
+=pEys
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64-glN64/files/mupen64-glN64-gtk2.patch b/games-emulation/mupen64-glN64/files/mupen64-glN64-gtk2.patch
new file mode 100644
index 000000000000..935da498aa33
--- /dev/null
+++ b/games-emulation/mupen64-glN64/files/mupen64-glN64-gtk2.patch
@@ -0,0 +1,16 @@
+--- glN64-0.4.1-rc2/Makefile.old	2005-01-07 12:21:52.532224798 -0800
++++ glN64-0.4.1-rc2/Makefile	2005-01-07 12:26:18.302433792 -0800
+@@ -1,11 +1,11 @@
+ DEFINES	=	-D__LINUX__ -DX86_ASM
+ CXX	=	g++
+-CXXFLAGS =	-I. $(DEFINES) `sdl-config --cflags` `gtk-config --cflags gtk gthread` `glib-config --cflags`
++CXXFLAGS =	-I. $(DEFINES) `sdl-config --cflags` `pkg-config --cflags gtk+-2.0 glib-2.0` -D_GTK2
+ #CXXFLAGS =	-I. $(DEFINES) `sdl-config --cflags` `gtk-config --cflags gtk gthread` \
+ #		 `glib-config --cflags` -g3 #-DDEBUG
+ LD	=	g++
+ LDFLAGS	=	-shared -Wl,-Bsymbolic
+-LIBS	=	`sdl-config --libs` `gtk-config --libs gtk gthread` `glib-config --libs` -lGL -lGLU
++LIBS	=	`sdl-config --libs` `pkg-config --libs gtk+-2.0 glib-2.0 gthread-2.0` -lGL -lGLU
+ TARGET	=	glN64-0.4.1.so
+ OBJECTS	=	2xSAI.o \
+ 		CRC.o \
diff --git a/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2.ebuild b/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2.ebuild
index 88a7f037cceb..2c10451c2fcf 100644
--- a/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2.ebuild
+++ b/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2.ebuild,v 1.1 2005/01/06 04:29:40 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2.ebuild,v 1.2 2005/01/07 21:11:13 morfic Exp $
 
 inherit games
 
@@ -19,10 +19,10 @@ RDEPEND="media-libs/libsdl"
 
 src_compile () {
 	epatch ${FILESDIR}/${PN}-compile.patch || die "patch failed"
-
+	epatch ${FILESDIR}/${PN}-gtk2.patch
 	if use x86; then
 		if use asm; then
-			einfo "using x86 asm where aviable"
+			einfo "using x86 asm where available"
 		else
 			epatch ${FILESDIR}/${PN}-noasm.patch
 		fi