[svn] r4835 - trunk/rpms/gnuboy

[packagers at lists.rpmforge.net]

Author: thias
Date: 2006-10-17 16:21:04 +0200 (Tue, 17 Oct 2006)
New Revision: 4835

Added:
   trunk/rpms/gnuboy/gnuboy-1.0.3-s64.patch
Modified:
   trunk/rpms/gnuboy/gnuboy.spec
Log:
Fix gnuboy build on FC6 i386.


Added: trunk/rpms/gnuboy/gnuboy-1.0.3-s64.patch
===================================================================
--- trunk/rpms/gnuboy/gnuboy-1.0.3-s64.patch	                        (rev 0)
+++ trunk/rpms/gnuboy/gnuboy-1.0.3-s64.patch	2006-10-17 14:21:04 UTC (rev 4835)
@@ -0,0 +1,12 @@
+diff -Naupr gnuboy-1.0.3.orig/sys/linux/joy.c gnuboy-1.0.3/sys/linux/joy.c
+--- gnuboy-1.0.3.orig/sys/linux/joy.c	2001-09-23 20:01:18.000000000 +0200
++++ gnuboy-1.0.3/sys/linux/joy.c	2006-10-17 16:13:53.000000000 +0200
+@@ -3,6 +3,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ char *strdup();
++typedef __signed__ long long __s64;
++typedef unsigned long long __u64;
+ #include <linux/joystick.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>

Modified: trunk/rpms/gnuboy/gnuboy.spec
===================================================================
--- trunk/rpms/gnuboy/gnuboy.spec	2006-10-17 13:10:25 UTC (rev 4834)
+++ trunk/rpms/gnuboy/gnuboy.spec	2006-10-17 14:21:04 UTC (rev 4835)
@@ -11,11 +11,12 @@
 Summary: Nintendo GameBoy Color emulator
 Name: gnuboy
 Version: 1.0.3
-Release: 10
+Release: 11
 License: GPL
 Group: Applications/Emulators
+URL: http://gnuboy.unix-fu.org/
 Source: http://gnuboy.unix-fu.org/src/%{name}-%{version}.tar.gz
-URL: http://gnuboy.unix-fu.org/
+Patch0: gnuboy-1.0.3-s64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: SDL >= 1.2.0
 BuildRequires: SDL-devel >= 1.2.0
@@ -29,6 +30,7 @@
 
 %prep
 %setup
+%patch0 -p1 -b .s64
 
 
 %build
@@ -52,6 +54,10 @@
 
 
 %changelog
+* Tue Oct 17 2006 Matthias Saou <http://freshrpms.net/> 1.0.3-11
+- Add patch to force definition of __s64 since when using -ansi on i386 it
+  doesn't get defined anymore.
+
 * Wed Mar 22 2006 Matthias Saou <http://freshrpms.net/> 1.0.3-10
 - Fix modular X build requirement.