Fixed gcc-3.4 compile issues.

4 files changed, 53 insertions, 4 deletions

diff --git a/games-emulation/tuxnes/ChangeLog b/games-emulation/tuxnes/ChangeLog
index a673d5dc30e1..1401fb4052c6 100644
--- a/games-emulation/tuxnes/ChangeLog
+++ b/games-emulation/tuxnes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/tuxnes
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/ChangeLog,v 1.3 2004/06/24 22:36:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/ChangeLog,v 1.4 2004/09/27 15:04:28 sekretarz Exp $
+
+  27 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/tuxnes-0.75-gcc34.patch, tuxnes-0.75.ebuild:
+  Fixed gcc-3.4 compile issues. Thanks to Thomas Cort <tcort@cs.ubishops.ca> in
+  Bug #65450
 
 *tuxnes-0.75 (11 Dec 2002)
 
diff --git a/games-emulation/tuxnes/Manifest b/games-emulation/tuxnes/Manifest
index 8ec2c61768ed..54abd597e5b3 100644
--- a/games-emulation/tuxnes/Manifest
+++ b/games-emulation/tuxnes/Manifest
@@ -1,5 +1,6 @@
-MD5 a81c4292497a03c8ab3228f86e852074 tuxnes-0.75.ebuild 1097
-MD5 170208826a244ba77d53a5221194e572 ChangeLog 444
+MD5 105585fc749e36604e288052b7fa31d8 tuxnes-0.75.ebuild 1151
+MD5 9c4b38765196a88da27cfe53917d0c1d ChangeLog 647
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 55a5bee2cd9089545a3b10f1833f5a9a files/digest-tuxnes-0.75 63
+MD5 39e9a0b8849012419b53f70ddc8a8127 files/tuxnes-0.75-gcc34.patch 1068
 MD5 9369efb94f81b1043189d4f72ae048d7 files/configure.in-tuxnes-0.75-gentoo.diff 1739
diff --git a/games-emulation/tuxnes/files/tuxnes-0.75-gcc34.patch b/games-emulation/tuxnes/files/tuxnes-0.75-gcc34.patch
new file mode 100644
index 000000000000..9f33633e75db
--- /dev/null
+++ b/games-emulation/tuxnes/files/tuxnes-0.75-gcc34.patch
@@ -0,0 +1,39 @@
+diff -urN tuxnes-0.75.orig/emu.c tuxnes-0.75/emu.c
+--- tuxnes-0.75.orig/emu.c	2001-04-11 17:45:47.000000000 -0400
++++ tuxnes-0.75/emu.c	2004-09-26 16:24:56.273450432 -0400
+@@ -890,7 +890,7 @@
+       len = strlen(palfile) + 1;
+       if (! (buffer = malloc(len)))
+ 	{
+-	  perror (__FUNCTION__ ": malloc");
++	  perror ("loadpal: malloc");
+ 	  return;
+ 	}
+       memcpy (buffer, palfile, len);
+@@ -912,7 +912,7 @@
+       len = strlen(filename) + 1;
+       if (! (buffer = malloc(len)))
+ 	{
+-	  perror (__FUNCTION__ ": malloc");
++	  perror ("loadpal: malloc");
+ 	  return;
+ 	}
+       memcpy (buffer, filename, len);
+@@ -924,7 +924,7 @@
+ 	return;
+       if (!(palfile = malloc ((len = strlen (filename)) + 11)))
+         {
+-          perror (__FUNCTION__ ": malloc");
++          perror ("loadpal: malloc");
+           return;
+         }
+       strcpy (palfile, filename);
+@@ -1602,7 +1602,7 @@
+ 
+     if (! (basefilename = malloc(baseend - basestart + 1)))
+       {
+-        perror (__FUNCTION__ ": malloc");
++        perror ("main: malloc");
+         exit (1);
+       }
+ 
diff --git a/games-emulation/tuxnes/tuxnes-0.75.ebuild b/games-emulation/tuxnes/tuxnes-0.75.ebuild
index ad0c458ccff5..2f1ee454a9ae 100644
--- a/games-emulation/tuxnes/tuxnes-0.75.ebuild
+++ b/games-emulation/tuxnes/tuxnes-0.75.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/tuxnes-0.75.ebuild,v 1.3 2004/06/24 22:36:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/tuxnes-0.75.ebuild,v 1.4 2004/09/27 15:04:28 sekretarz Exp $
 
 inherit flag-o-matic eutils
 
@@ -22,6 +22,10 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/configure.in-${P}-gentoo.diff
+
+	#gcc-3.4 fix
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
 	autoreconf &>/dev/null
 }