rpms/osmose/F-17 osmose-0.9.96-gcc47.patch, NONE, 1.1 osmose.spec, 1.8, 1.9
Author: musuruan
Update of /cvs/free/rpms/osmose/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28437
Modified Files:
osmose.spec
Added Files:
osmose-0.9.96-gcc47.patch
Log Message:
* Sun Mar 18 2012 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.96-4
- Fixed FTBFS for F17+
osmose-0.9.96-gcc47.patch:
Joystick.h | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE osmose-0.9.96-gcc47.patch ---
diff -durN Osmose-0-9-96-QT/Joystick.h Osmose-0-9-96-QT-fixed/Joystick.h
--- Osmose-0-9-96-QT/Joystick.h 2011-06-06 09:06:20.000000000 +0200
+++ Osmose-0-9-96-QT-fixed/Joystick.h 2012-03-18 16:21:32.209524288 +0100
@@ -35,6 +35,7 @@
#ifndef JOYSTICK_H
#define JOYSTICK_H
+#include <unistd.h>
#include <iostream>
#include <fcntl.h>
#include <errno.h>
Index: osmose.spec
===================================================================
RCS file: /cvs/free/rpms/osmose/F-17/osmose.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- osmose.spec 2 Mar 2012 15:00:03 -0000 1.8
+++ osmose.spec 18 Mar 2012 15:32:36 -0000 1.9
@@ -3,7 +3,7 @@
Name: osmose
Version: 0.9.96
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Sega Master System / Game Gear emulator
Group: Applications/Emulators
@@ -13,6 +13,8 @@
Source1: %{name}.desktop
# Use system minizip
Patch0: %{name}-0.9.96-usesystemlibraries.patch
+# Fix building with gcc 4.7
+Patch1: %{name}-0.9.96-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
@@ -27,6 +29,7 @@
%prep
%setup -q -n %{pkgname}-%{pkgversion}-QT
%patch0 -p1
+%patch1 -p1
# Fix end-of-line encoding
sed -i 's/\r//' *.{cpp,h} cpu/*.{cpp,h}
@@ -69,6 +72,9 @@
%changelog
+* Sun Mar 18 2012 Andrea Musuruane <musuruan(a)gmail.com> - 0.9.96-4
+- Fixed FTBFS for F17+
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.9.96-3
- Rebuilt for c++ ABI breakage