rpms/desmume/devel desmume-0.9.7-gcc47.patch, NONE, 1.1 desmume.spec, 1.16, 1.17 desmume-0.9.5-bigendian.patch, 1.1, NONE
Author: musuruan
Update of /cvs/free/rpms/desmume/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8551
Modified Files:
desmume.spec
Added Files:
desmume-0.9.7-gcc47.patch
Removed Files:
desmume-0.9.5-bigendian.patch
Log Message:
* Sat Mar 17 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-4
- Fixed FTBFS for F17+
desmume-0.9.7-gcc47.patch:
emufile.cpp | 1 +
rasterize.cpp | 1 +
2 files changed, 2 insertions(+)
--- NEW FILE desmume-0.9.7-gcc47.patch ---
diff -durN desmume-0.9.7.orig/src/emufile.cpp desmume-0.9.7/src/emufile.cpp
--- desmume-0.9.7.orig/src/emufile.cpp 2011-01-27 11:27:00.000000000 +0100
+++ desmume-0.9.7/src/emufile.cpp 2012-03-17 17:11:05.904946500 +0100
@@ -1,5 +1,6 @@
#include "emufile.h"
+#include <unistd.h>
#include <vector>
bool EMUFILE::readAllBytes(std::vector<u8>* dstbuf, const std::string& fname)
diff -durN desmume-0.9.7.orig/src/rasterize.cpp desmume-0.9.7/src/rasterize.cpp
--- desmume-0.9.7.orig/src/rasterize.cpp 2011-01-27 11:27:00.000000000 +0100
+++ desmume-0.9.7/src/rasterize.cpp 2012-03-17 17:35:26.698800383 +0100
@@ -34,6 +34,7 @@
#include <assert.h>
#include <math.h>
#include <string.h>
+#include <stdint.h>
#include "bits.h"
#include "common.h"
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/desmume.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- desmume.spec 17 Mar 2012 15:30:14 -0000 1.16
+++ desmume.spec 17 Mar 2012 16:43:39 -0000 1.17
@@ -1,13 +1,16 @@
Name: desmume
Version: 0.9.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://desmume.org/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Do not look into builddir
Patch0: %{name}-0.9-dontlookinbuilddir.patch
+# Fixes FTBFS for gcc 4.7
+Patch1: %{name}-0.9.7-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkglext-devel
@@ -46,6 +49,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# Fix end-of-line encoding
sed -i 's/\r//' AUTHORS
@@ -174,6 +178,9 @@
%changelog
+* Sat Mar 17 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-4
+- Fixed FTBFS for F17+
+
* Sat Mar 17 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-3
- Fixed an error in desmume-glade.desktop (BZ #2229)
--- desmume-0.9.5-bigendian.patch DELETED ---