add patch from Leonardo Boshell via bug #125861 to fix memory issue

Package-Manager: portage-2.1.1_pre5-r1

4 files changed, 42 insertions, 24 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 906c8481d2ef..4fe1577cb3ce 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/zsnes
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.21 2006/04/13 20:36:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.22 2006/08/15 17:41:03 mr_bones_ Exp $
+
+  15 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/zsnes-1.42-memfix.patch, zsnes-1.42.ebuild:
+  add patch from Leonardo Boshell via bug #125861 to fix memory issue
 
   13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> zsnes-1.42.ebuild:
   Moved games_pkg_setup to the beginning of pkg_setup.
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index b6a9e2740a0d..aed31b09c7b7 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.42-configure.patch 1518 RMD160 461d0b076ff55b4d6f65556bbce7d85a85ec5b44 SHA1 3948333b943e7e682548333b5459481f375d09eb SHA256 ef010a97ed0228f5041a5b26609fcbd5a886330950619d914ffdeedcaeb64689
 MD5 f06a27f135c6456df1e559f7ca99106c files/1.42-configure.patch 1518
 RMD160 461d0b076ff55b4d6f65556bbce7d85a85ec5b44 files/1.42-configure.patch 1518
@@ -9,15 +6,19 @@ AUX zsnes-1.42-execStack.patch 16885 RMD160 72e21cb407825badfbe257946d30c3de69bb
 MD5 af4242df89826be6b9cbf6536f3c27c3 files/zsnes-1.42-execStack.patch 16885
 RMD160 72e21cb407825badfbe257946d30c3de69bb1113 files/zsnes-1.42-execStack.patch 16885
 SHA256 bb1dd94096ca2d24b8af1cbf53f31356cb4b92f83c4f2c53b4fd4922642ed289 files/zsnes-1.42-execStack.patch 16885
-DIST zsnes142src.tar.gz 1102840 RMD160 d794c69e876265715e141c26ecb6ed1802ffc27d SHA256 f06ef14db8d3fdae9d7c12442a52e535a5feee1cb18c78b51a74ed282ed874be
-EBUILD zsnes-1.42.ebuild 1444 RMD160 de1437711069eccedf965769cee167c37b123669 SHA1 336a5754bf674deb98fcad51762b3bb377521ca9 SHA256 cb79f4d1a0b1e7d560b7019fbe0696e7bde0a503ff967c1fbfa3fdb5b710bc66
-MD5 eb91d36ca5f380d5c0cd9e7a539637d0 zsnes-1.42.ebuild 1444
-RMD160 de1437711069eccedf965769cee167c37b123669 zsnes-1.42.ebuild 1444
-SHA256 cb79f4d1a0b1e7d560b7019fbe0696e7bde0a503ff967c1fbfa3fdb5b710bc66 zsnes-1.42.ebuild 1444
-MISC ChangeLog 5595 RMD160 57c617ebab3a34b99b57878844fc8109a267e63e SHA1 f1b742f06b957247e787a725d35f17e78e8aaeb8 SHA256 b4e6029066ca7caaaafe23c6a44e01ebbfd64832b081ea89fb54597d5f9f1301
-MD5 e84ed47513ff91b5ba6289573b6b28bf ChangeLog 5595
-RMD160 57c617ebab3a34b99b57878844fc8109a267e63e ChangeLog 5595
-SHA256 b4e6029066ca7caaaafe23c6a44e01ebbfd64832b081ea89fb54597d5f9f1301 ChangeLog 5595
+AUX zsnes-1.42-memfix.patch 565 RMD160 558c260bdca2a158c6f1c22bfc6dcc40c08c5ed7 SHA1 ff6aa2c1ef9be20493ead2266969d18399e7a4be SHA256 f95812e735ea1500fb05025f787497ef8f0bc4c12cb6b7642d2072359387a6b4
+MD5 c5c57d18d06a3d2c2f808da29aa981d0 files/zsnes-1.42-memfix.patch 565
+RMD160 558c260bdca2a158c6f1c22bfc6dcc40c08c5ed7 files/zsnes-1.42-memfix.patch 565
+SHA256 f95812e735ea1500fb05025f787497ef8f0bc4c12cb6b7642d2072359387a6b4 files/zsnes-1.42-memfix.patch 565
+DIST zsnes142src.tar.gz 1102840 RMD160 d794c69e876265715e141c26ecb6ed1802ffc27d SHA1 d38ca8c1b4168edc5bb5815f504b52654100bc4b SHA256 f06ef14db8d3fdae9d7c12442a52e535a5feee1cb18c78b51a74ed282ed874be
+EBUILD zsnes-1.42.ebuild 1459 RMD160 8c107dc80e0071891f27aecbde277b98e8a8eea6 SHA1 18d74b3e5b0fd5f359232c7702c3b5aef0a8cf9b SHA256 6c33addb0ad7ecdf6fff14d10e292c29fcf7dbecc16cd68c91f369d76ae30862
+MD5 e8e0f5aa358910d8e3dcacd8185f1e74 zsnes-1.42.ebuild 1459
+RMD160 8c107dc80e0071891f27aecbde277b98e8a8eea6 zsnes-1.42.ebuild 1459
+SHA256 6c33addb0ad7ecdf6fff14d10e292c29fcf7dbecc16cd68c91f369d76ae30862 zsnes-1.42.ebuild 1459
+MISC ChangeLog 5775 RMD160 aacf9aecce1e2ebe5660dae7f58bf25c4a06bacb SHA1 1bd2c70eb32fc75b93d61b2df431dc024c1bd351 SHA256 15a56a98645b315f31e6d10929ec3d9dea6dc29830a99416c97ed5f204fd0bf7
+MD5 003c27605565b7f8144fc7898eb34bee ChangeLog 5775
+RMD160 aacf9aecce1e2ebe5660dae7f58bf25c4a06bacb ChangeLog 5775
+SHA256 15a56a98645b315f31e6d10929ec3d9dea6dc29830a99416c97ed5f204fd0bf7 ChangeLog 5775
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -25,10 +26,3 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 f1839404902e2726c8c80f281d70a374 files/digest-zsnes-1.42 238
 RMD160 5ce1d73df1789189a02442aa36cfdf9cca9a2d46 files/digest-zsnes-1.42 238
 SHA256 99166dbdf5a05f01c2a3d54159672d0c9ab10a032f251a0d7e95e96b8ce107cf files/digest-zsnes-1.42 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEmErgamhnQswr0vIRAi+SAKC6jc8Oe9ZRFEtaljEFDolaC/ZWaQCfVSlO
-mXLqgIrBYQeAHdSAWfSGv34=
-=jcg0
------END PGP SIGNATURE-----
diff --git a/games-emulation/zsnes/files/zsnes-1.42-memfix.patch b/games-emulation/zsnes/files/zsnes-1.42-memfix.patch
new file mode 100644
index 000000000000..a80ae3679984
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.42-memfix.patch
@@ -0,0 +1,19 @@
+diff -NurdB zsnes_1_42/src/linux/zfilew.c zsnes_1_42-patched/src/linux/zfilew.c
+--- zsnes_1_42/src/linux/zfilew.c	2005-01-14 08:11:19.000000000 -0500
++++ zsnes_1_42-patched/src/linux/zfilew.c	2006-03-16 02:16:42.000000000 -0500
+@@ -476,9 +476,13 @@
+   {
+     homedir = (char *)malloc(ZCFG_DIR_LEN);
+     getcwd(homedir, ZCFG_DIR_LEN);
++    strcpy(zcfgdir, homedir);
++    free(homedir);
++  }
++  else
++  {
++    strcpy(zcfgdir, homedir);
+   }
+-  strcpy(zcfgdir, homedir);
+-  free(homedir);
+   strcat(zcfgdir, ZCFG_DIR);
+   tmp = opendir(zcfgdir);
+   if (tmp == NULL) 
diff --git a/games-emulation/zsnes/zsnes-1.42.ebuild b/games-emulation/zsnes/zsnes-1.42.ebuild
index 4e64e501b7b7..167a405505c5 100644
--- a/games-emulation/zsnes/zsnes-1.42.ebuild
+++ b/games-emulation/zsnes/zsnes-1.42.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.42.ebuild,v 1.13 2006/06/20 19:17:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.42.ebuild,v 1.14 2006/08/15 17:41:03 mr_bones_ Exp $
 
-inherit eutils flag-o-matic multilib games
+inherit eutils autotools flag-o-matic multilib games
 
 DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
 HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
@@ -30,8 +30,9 @@ src_unpack() {
 	cd "${S}"/src
 	cp "icons/48x48x32.png" "${T}/zsnes.png"
 	epatch "${FILESDIR}"/${PV}-configure.patch \
-		"${FILESDIR}"/${P}-execStack.patch
-	aclocal && autoconf || die "autotools failed"
+		"${FILESDIR}"/${P}-execStack.patch \
+		"${FILESDIR}"/${P}-memfix.patch
+	eautoreconf
 }
 
 src_compile() {