Fix compile with gcc47 (bug #419635), submitted by Nikos Chantziaras

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

9 files changed, 51 insertions, 28 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 9f823f8504df..a5914d44d421 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/zsnes
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.48 2011/09/29 20:11:35 mr_bones_ Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.49 2012/06/04 20:04:18 mr_bones_ Exp $
+
+  04 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> zsnes-1.51-r2.ebuild,
+  files/zsnes-1.51-CC-quotes.patch,
+  files/zsnes-1.51-archopt-july-23-update.patch, files/zsnes-1.51-buffer.patch,
+  files/zsnes-1.51-depbuild.patch, +files/zsnes-1.51-gcc47.patch,
+  files/zsnes-1.51-libpng.patch:
+  Fix compile with gcc47 (bug #419635), submitted by Nikos Chantziaras
 
   29 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> zsnes-1.51-r2.ebuild,
   +files/zsnes-1.51-buffer.patch:
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 20f7e26a75f6..2ce2cf5b3942 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,12 +1,13 @@
-AUX zsnes-1.51-CC-quotes.patch 812 RMD160 e0ed454da3a4ceb034089d8ca8b4ad5ea634a91e SHA1 73b2b1a5536e9bd7e3d0a24f86c2ce36103cfe66 SHA256 88082857f72d10e629a0b725d7ca3b558e9e0e733e1da49494c52cafadbb48a9
-AUX zsnes-1.51-archopt-july-23-update.patch 12740 RMD160 e8004f97f795c13d51fa16c5bf386dfc8b12058f SHA1 4e59c16f0e5c57cfa6e5df2b50026598e77eab5a SHA256 4fc49ccafe46dafb1db57226e6989f6a5c97e826595df881d90bad1694a9906e
-AUX zsnes-1.51-buffer.patch 3373 RMD160 6c1913d5dbdfa7c52f755d8f320cf85c10699637 SHA1 1412a0af84de45b806bab10bda5cd2e3de885948 SHA256 8d96a9bbf2b1075b16d3827a42efdbaf0c6c6cfa6e97609bfabe1b069b370d51
-AUX zsnes-1.51-depbuild.patch 631 RMD160 bd17f4dc521fb186a62e91350c9dcdc97c1c3256 SHA1 20568092a34c60f94038d3cc5b107e36269b4df2 SHA256 ab22b2fd1dfda5f377cafa0df19269259305aeab15d3c3ae6bf511b222dc6359
+AUX zsnes-1.51-CC-quotes.patch 740 RMD160 edddef24850584314403a34f51d7505c2c2fdac6 SHA1 dc173400d013188a87472acd7bc5774274a819dc SHA256 73f4cfa22b93c9633bb5e748054bbabb75a03634988cddea0f1c4c8f6bca71bc
+AUX zsnes-1.51-archopt-july-23-update.patch 12668 RMD160 7bc765680223fc4583f2a73d019766bd3212537d SHA1 cfd1b6f6981263ba4b4c2271e95424f65c6fe8af SHA256 6d134d3cc8682ed71fc287023cb5e234aa9bbbd162d4a9de69ff6e3ff549f645
+AUX zsnes-1.51-buffer.patch 3157 RMD160 abb9834f649be6b730e0bf393b2451e13af40e0f SHA1 9be5abad6aa7dd799fc4318cebf0c9f4bca2cae9 SHA256 177fb1df4ecddf1e120cc7cb788d76ac8a18078edc2c9818691a6f7919f3ac2c
+AUX zsnes-1.51-depbuild.patch 559 RMD160 5a8bfeba6a8a21bd8922b4274311ff14e6b39ff5 SHA1 72b7f4b2421cabe239354ba421faa73d9c817a26 SHA256 2e6e0bb1fbccee7635f30174f1607db7a11036c8af26e8c25b4aa78204da6f22
 AUX zsnes-1.51-gcc43.patch 913 RMD160 95ab52f570dd1e5c7d0852dac17d56ada4939079 SHA1 9bbececf44cc48a4d6b48ebff66ba657ef409168 SHA256 9eb0aff2be2b303295b0d0a76240facd13dca170b97fe3ee827a6c26d89d53de
+AUX zsnes-1.51-gcc47.patch 316 RMD160 af379d99ea5078f0dc526d262959d80ff5c82909 SHA1 0c0bba18501490d643ca09d7242008720b80afd9 SHA256 ccd1343e51a294c425e14dfc2a9a4f519111630a0e8dfb6a33438fd336693e38
 AUX zsnes-1.51-libao-thread.patch 663 RMD160 10b0ce28577e39187f98d8f392462585148d34eb SHA1 67a34c9a5f8c6abb2881007d47ba10647ca4503a SHA256 71be0bbb8b683edc7c7780b68a43e54be7a8c341bf9b2a01e5cceb53834b1a73
-AUX zsnes-1.51-libpng.patch 974 RMD160 36bdb059c6641376bee6ea5040a7045420c02870 SHA1 a4f7960de8eece5ac1c51cc8b58f6fb8964bca40 SHA256 9e5ba014ba847f7e10075dfd51b0ca42b86aa2dcc47952d569c304f3e8e15470
+AUX zsnes-1.51-libpng.patch 854 RMD160 c6a5208196c6b90f94d78a6c3055d53ac74df8a6 SHA1 ced94445cbe71d146e0a1cafce6f96d552d182bd SHA256 8fa8614c9dd4360c05fb4c581a8c8aba89195dc4da0c087daa18845b7ab499be
 AUX zsnes-1.51-libpng15.patch 510 RMD160 72682ef320f6b23e3626e7acfa2479b2ccb00b7f SHA1 e6c8d2985d602c659a472e23278f9e0f2c2e6aea SHA256 c9636e76441ae1624c8ddc92e47facc20b43871fb0f55fd50d526b10944c6560
 DIST zsnes151src.tar.bz2 1071712 RMD160 337407bf7e5516bcd7bf310c7b17d6d12a948750 SHA1 03df35490870c9950d7010747d0546c8525c0362 SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866
-EBUILD zsnes-1.51-r2.ebuild 2540 RMD160 0010a2b3493d0d565df82fbfd0e60a4cd4304550 SHA1 12cc986871dba8e01133728722774e1d9ec8512b SHA256 2340e8798b17a16f848220ef1731dece3371c76bd354c3f3240d036a812d9735
-MISC ChangeLog 9666 RMD160 d9b16d4f418ea7dc3a1d35c080a49c8c76d9c8f4 SHA1 406fac3e4bfd974f7baac640575644cb141bc9da SHA256 6e8581fd25f2a65a1374b0a394b427b18317ae731639655de5155a3cf6a33943
+EBUILD zsnes-1.51-r2.ebuild 2605 RMD160 6fc70c779c3d221398f6b5af08f2c9c94385c490 SHA1 f1334651373d8550d079ed992205b9cb99af3c81 SHA256 e2950082b1665c7c559a4b4aaf8dd71252ba36e7568546e04991f8e872d36b17
+MISC ChangeLog 10030 RMD160 26af2556628eeac0622446ed2380fe584abaad4a SHA1 21b005d2749377e78446c902cce88a52fadfabf5 SHA256 ff9b6ad5195d942beba8272e65762a8c8c32e3b958ec60dc082918729d94017c
 MISC metadata.xml 160 RMD160 f839c00d9f25c1f873f95ab899fb64060c1d0bf5 SHA1 08c3d180cf8dbef87e40c42a18b457516a5d7ffe SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d
diff --git a/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch b/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch
index 5a3b588b091d..d3230d6d70d5 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	2009-02-25 18:13:40.000000000 +0100
-+++ src/Makefile.in	2009-02-25 18:13:16.000000000 +0100
+--- src/Makefile.in.orig
++++ src/Makefile.in
 @@ -95,7 +95,7 @@
  %.o: %.cpp
  	@CXX@ @CXXFLAGS@ -o $@ -c $<
diff --git a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
index cd478923b1d9..ba118878a2bd 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
@@ -1,5 +1,5 @@
---- tools/archopt.c.old	2006-12-29 06:50:31.000000000 +0100
-+++ tools/archopt.c	2007-07-23 00:11:51.000000000 +0200
+--- tools/archopt.c.old
++++ tools/archopt.c
 @@ -1,8 +1,30 @@
 +/*
 +Copyright (C) 2005-2007 Nach, grinvader ( http://www.zsnes.com )
diff --git a/games-emulation/zsnes/files/zsnes-1.51-buffer.patch b/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
index 1f7754d7c16c..5f3049b315ed 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
@@ -1,5 +1,5 @@
---- zsnes_1_51/src/initc.c.fortify	2007-01-20 01:02:24.000000000 +0100
-+++ zsnes_1_51/src/initc.c	2007-02-26 12:10:19.000000000 +0100
+--- zsnes_1_51/src/initc.c.fortify
++++ zsnes_1_51/src/initc.c
 @@ -1464,8 +1464,8 @@
    clearmem2();
  }
@@ -38,8 +38,8 @@
  
      if (yesoutofmemory) { asm_call(outofmemfix); }
      asm_call(GUIDoReset);
---- zsnes_1_51/src/zstate.c.fortify	2007-02-26 12:14:30.000000000 +0100
-+++ zsnes_1_51/src/zstate.c	2007-02-26 12:17:22.000000000 +0100
+--- zsnes_1_51/src/zstate.c.fortify
++++ zsnes_1_51/src/zstate.c
 @@ -99,15 +99,15 @@
    copy_func(buffer, &cycpbl, 4);
    copy_func(buffer, &cycpblt, 4);
@@ -68,8 +68,8 @@
      }
      */
    }
---- zsnes_1_51/src/gblvars.h.fortify	2007-02-26 12:12:33.000000000 +0100
-+++ zsnes_1_51/src/gblvars.h	2007-02-26 12:12:36.000000000 +0100
+--- zsnes_1_51/src/gblvars.h.fortify
++++ zsnes_1_51/src/gblvars.h
 @@ -33,9 +33,9 @@
  extern unsigned int SfxR0, *setaramdata, ramsize, *sram, nmiprevaddrh;
  extern unsigned int tempesi, tempedi, tempedx, tempebp;
diff --git a/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch b/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch
index 737d0c0100fb..2dbb5f558a46 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch
@@ -1,5 +1,5 @@
---- src/tools/depbuild.cpp.orig	2006-12-27 12:04:05.000000000 +0100
-+++ src/tools/depbuild.cpp	2009-02-02 17:24:17.980006252 +0100
+--- src/tools/depbuild.cpp.orig
++++ src/tools/depbuild.cpp
 @@ -130,7 +130,20 @@
  void dependency_calculate_asm(const char *filename)
  {
diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
new file mode 100644
index 000000000000..e58102415212
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
@@ -0,0 +1,15 @@
+Fix compile with gcc47
+Bug #419635
+https://bugs.gentoo.org/show_bug.cgi?id=419635
+Submitted by Nikos Chantziaras
+
+--- a/src/tools/depbuild.cpp
++++ b/src/tools/depbuild.cpp
+@@ -25,6 +25,7 @@
+ #include <string>
+ #include <cstdio>
+ #include <cstdlib>
++#include <unistd.h>
+ using namespace std;
+ 
+ #include "fileutil.h"
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libpng.patch b/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
index 0611697c868f..4e49054c0972 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
@@ -1,7 +1,5 @@
-Index: acinclude.m4
-===================================================================
---- acinclude.m4	(revisione 4838)
-+++ acinclude.m4	(copia locale)
+--- acinclude.m4
++++ acinclude.m4
 @@ -163,21 +163,21 @@
    libpng_prefix="")
  
diff --git a/games-emulation/zsnes/zsnes-1.51-r2.ebuild b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
index ce337fd48112..5bdacdd02d5b 100644
--- a/games-emulation/zsnes/zsnes-1.51-r2.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.9 2011/09/29 20:11:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.10 2012/06/04 20:04:18 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils autotools flag-o-matic toolchain-funcs multilib games
@@ -34,6 +34,7 @@ src_prepare() {
 	# Fix bug #260247
 	# Fix compability with libpng15 wrt #378735
 	# Fix buffer overwrite #257963
+	# Fix gcc47 compile #419635
 	epatch \
 		"${FILESDIR}"/${P}-libpng.patch \
 		"${FILESDIR}"/${P}-archopt-july-23-update.patch \
@@ -42,7 +43,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-depbuild.patch \
 		"${FILESDIR}"/${P}-CC-quotes.patch \
 		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-buffer.patch
+		"${FILESDIR}"/${P}-buffer.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 
 	sed -i -e '67i#define OF(x) x' zip/zunzip.h || die