Add patch to fix compilation with gcc-4.1; bug #126596

(Portage version: 2.1_pre7-r5)

4 files changed, 59 insertions, 7 deletions

diff --git a/games-emulation/mupen64-alsasnd/ChangeLog b/games-emulation/mupen64-alsasnd/ChangeLog
index 700649553a80..76b0938c2843 100644
--- a/games-emulation/mupen64-alsasnd/ChangeLog
+++ b/games-emulation/mupen64-alsasnd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64-alsasnd
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/ChangeLog,v 1.8 2005/09/20 15:04:28 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/ChangeLog,v 1.9 2006/04/14 04:06:37 halcy0n Exp $
+
+  14 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/mupen64-alsasnd-0.4-gcc41.patch, mupen64-alsasnd-0.4.ebuild:
+  Add patch to fix compilation with gcc-4.1; bug #126596
 
   20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
   mupen64-alsasnd-0.4.ebuild:
diff --git a/games-emulation/mupen64-alsasnd/Manifest b/games-emulation/mupen64-alsasnd/Manifest
index 1354fa1279bd..7e41190221aa 100644
--- a/games-emulation/mupen64-alsasnd/Manifest
+++ b/games-emulation/mupen64-alsasnd/Manifest
@@ -1,6 +1,21 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 28291b6c6c50f516108092d8ba4a7718 mupen64-alsasnd-0.4.ebuild 1267
 MD5 2ac2bbe599446462d1216d232a3ed41f ChangeLog 1100
+RMD160 d4cd620dfc64d168603c8ce5588909379327fc8c ChangeLog 1100
+SHA256 00695d2be050d0a28718bcf3c66b29ed72f303c49c8c57dfd2517b9ce497b361 ChangeLog 1100
 MD5 49a9052e77c664f4a2c6b092c62b39f6 files/0.4-gentoo.patch 560
+RMD160 b0def3dfec48dcd3e9b49ae00e5ba91eb7b6d0fd files/0.4-gentoo.patch 560
+SHA256 a05f223c25946b60d02e86756c7f06aa362bde3c68f246a7ec59913a18662013 files/0.4-gentoo.patch 560
 MD5 15dd3b6cd3a33e7fcba000b2b38b9bd2 files/0.4-gtk.patch 1203
+RMD160 c335a844733d33f41348a26e4dc9d0a3ab697eac files/0.4-gtk.patch 1203
+SHA256 bf9cb3ec085b124d7de1a0e06623e1a36dc25e5e1f8bcb7019f4bcaa274195d8 files/0.4-gtk.patch 1203
 MD5 658b03e564090a62ea13902273e73ae4 files/digest-mupen64-alsasnd-0.4 70
+RMD160 7bcadab4d79b0bf484bd7d0d6eb2b11f277c5080 files/digest-mupen64-alsasnd-0.4 70
+SHA256 a723d5dc87ac91ee57928ac6049cd60bd5cc5fb0cf7e1f1edda95db9d68b3a3a files/digest-mupen64-alsasnd-0.4 70
+MD5 252aa1c16f2e1919d6d761e245d9e2a0 files/mupen64-alsasnd-0.4-gcc41.patch 1131
+RMD160 920f8fd1afee8720c114d3f47e45b6d221a9b93a files/mupen64-alsasnd-0.4-gcc41.patch 1131
+SHA256 76fbeaeef548417e99ede5c9e087b08712c515866a7b15b9baff60842e81f3f1 files/mupen64-alsasnd-0.4-gcc41.patch 1131
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 6732b6b0611be2a94d1b7dc9049d1cae mupen64-alsasnd-0.4.ebuild 1302
+RMD160 867d053d80ff28dca6eee0935d3ad68e394049cb mupen64-alsasnd-0.4.ebuild 1302
+SHA256 1f196b49bd668dc7af834c5dce7a123ea790e3887a9242bc5ee732124f027e32 mupen64-alsasnd-0.4.ebuild 1302
diff --git a/games-emulation/mupen64-alsasnd/files/mupen64-alsasnd-0.4-gcc41.patch b/games-emulation/mupen64-alsasnd/files/mupen64-alsasnd-0.4-gcc41.patch
new file mode 100644
index 000000000000..ccea231c62a8
--- /dev/null
+++ b/games-emulation/mupen64-alsasnd/files/mupen64-alsasnd-0.4-gcc41.patch
@@ -0,0 +1,32 @@
+diff -ur alsa_plugin-orig/gtk1_gui.cpp alsa_plugin/gtk1_gui.cpp
+--- alsa_plugin-orig/gtk1_gui.cpp	2006-03-18 01:50:47.000000000 -0500
++++ alsa_plugin/gtk1_gui.cpp	2006-03-18 01:54:53.000000000 -0500
+@@ -54,6 +54,16 @@
+ 	void setupAboutDialog();
+ };
+ 
++//Forward declarations
++void begin_testing();
++bool key_press_event_func( GtkWidget *, GdkEventKey * );
++void loadDefaultValues();
++void loadConfigurationFromFile();
++void saveConfigurationToFile();
++void ok_pressed();
++void cancel_config();
++
++
+ void CreateGUIObject( Plugin_Graphical_Interface **GUI, Plugin_Audio_Driver *drv )
+ {
+ 	*GUI = dynamic_cast<Plugin_Graphical_Interface *>(new GTK1_Interface( drv ));
+diff -ur alsa_plugin-orig/qt3_gui.cpp alsa_plugin/qt3_gui.cpp
+--- alsa_plugin-orig/qt3_gui.cpp	2006-03-18 01:50:47.000000000 -0500
++++ alsa_plugin/qt3_gui.cpp	2006-03-18 01:58:45.000000000 -0500
+@@ -90,7 +90,7 @@
+ 
+ void CreateGUIObject( Plugin_Graphical_Interface **GUI, Plugin_Audio_Driver *drv )
+ {
+-	( ( QT3_Interface * )( *GUI ) ) = new QT3_Interface( drv );
++	( *GUI ) = new QT3_Interface( drv );
+ }
+ 
+ void DeleteGUIObject( Plugin_Graphical_Interface **GUI )
diff --git a/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild b/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild
index 53e56c74ad4f..e5e18f8a2c26 100644
--- a/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild
+++ b/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild
@@ -1,6 +1,6 @@
-# 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/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild,v 1.13 2005/09/20 15:04:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild,v 1.14 2006/04/14 04:06:37 halcy0n Exp $
 
 inherit eutils games
 
@@ -32,7 +32,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PV}-gentoo.patch" \
-		"${FILESDIR}/${PV}-gtk.patch"
+		"${FILESDIR}/${PV}-gtk.patch" \
+		"${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {