[svn] r4714 - trunk/rpms/snes9express

[packagers at lists.rpmforge.net]

Author: thias
Date: 2006-09-04 16:09:45 +0200 (Mon, 04 Sep 2006)
New Revision: 4714

Added:
   trunk/rpms/snes9express/snes9express-1.42-gcc41.patch
Modified:
   trunk/rpms/snes9express/snes9express.spec
Log:
Fix snes9express build for FC5+ (gcc 4.1 patch from Gentoo).


Added: trunk/rpms/snes9express/snes9express-1.42-gcc41.patch
===================================================================
--- trunk/rpms/snes9express/snes9express-1.42-gcc41.patch	                        (rev 0)
+++ trunk/rpms/snes9express/snes9express-1.42-gcc41.patch	2006-09-04 14:09:45 UTC (rev 4714)
@@ -0,0 +1,12 @@
+--- s9xskin.h.old	2006-05-03 23:45:10.000000000 +0200
++++ s9xskin.h	2006-05-03 23:51:25.000000000 +0200
+@@ -23,8 +23,8 @@
+ 
+ class s9x_SkinFileBase
+ {
+- typedef std::map<std::string,s9x_SkinFileIndexRecord*> index;
+  protected:
++ typedef std::map<std::string,s9x_SkinFileIndexRecord*> index;
+ 	index idx;
+ 	FILE*skinfptr;
+  public:

Modified: trunk/rpms/snes9express/snes9express.spec
===================================================================
--- trunk/rpms/snes9express/snes9express.spec	2006-09-04 13:07:31 UTC (rev 4713)
+++ trunk/rpms/snes9express/snes9express.spec	2006-09-04 14:09:45 UTC (rev 4714)
@@ -12,13 +12,14 @@
 Summary: Graphical front-end to snes9x, the SNES emulator
 Name: snes9express
 Version: 1.42
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Emulators
 URL: http://www.linuxgames.com/snes9express/
 Source0: http://dl.sf.net/snes9express/snes9express-%{version}.tar.gz
 Source1: snes.png
-Patch: snes9express-1.42-errno.patch
+Patch0: snes9express-1.42-errno.patch
+Patch1: snes9express-1.42-gcc41.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, gtk2-devel
 %{!?_without_freedesktop:BuildRequires: desktop-file-utils}
@@ -31,7 +32,8 @@
 
 %prep
 %setup
-%patch -p1 -b .errno
+%patch0 -p1 -b .errno
+%patch1 -p0 -b .gcc41
 
 
 %build
@@ -91,6 +93,9 @@
 
 
 %changelog
+* Mon Sep  4 2006 Matthias Saou <http://freshrpms.net/> 1.42-2
+- Add gcc41 patch from Gentoo.
+
 * Sun Oct 19 2004 Matthias Saou <http://freshrpms.net/> 1.42-1
 - Initial RPM release.