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

(Portage version: 2.1.10.49/cvs/Linux x86_64)

8 files changed, 43 insertions, 21 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/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