[openmsx] Fix FTBFS

Hans de Goede jwrdegoede at fedoraproject.org
Sat Jul 28 10:30:43 UTC 2012


commit 4ac8c02c5c0d68943ffe71591373a9f62218d07b
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Jul 28 12:35:48 2012 +0200

    Fix FTBFS

 openmsx-0.8.2-zlib.patch |   13 +++++++++++++
 openmsx.spec             |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/openmsx-0.8.2-zlib.patch b/openmsx-0.8.2-zlib.patch
new file mode 100644
index 0000000..8cc356c
--- /dev/null
+++ b/openmsx-0.8.2-zlib.patch
@@ -0,0 +1,13 @@
+diff -up openmsx-0.8.2/src/serialize.hh~ openmsx-0.8.2/src/serialize.hh
+--- openmsx-0.8.2/src/serialize.hh~	2012-01-25 21:49:36.000000000 +0100
++++ openmsx-0.8.2/src/serialize.hh	2012-07-28 12:15:32.541535197 +0200
+@@ -18,8 +18,7 @@
+ #include <sstream>
+ #include <cassert>
+ #include <memory>
+-
+-typedef void* gzFile;
++#include <zlib.h>
+ 
+ namespace openmsx {
+ 
diff --git a/openmsx.spec b/openmsx.spec
index b06266e..6301347 100644
--- a/openmsx.spec
+++ b/openmsx.spec
@@ -1,12 +1,13 @@
 Name:           openmsx
 Version:        0.8.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An emulator for the MSX home computer system
 Group:          Applications/Emulators
 License:        GPL+
 URL:            http://openmsx.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         openmsx-0.6.1-installbase.patch
+Patch1:         openmsx-0.8.2-zlib.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-utils
 BuildRequires:  glew-devel >= 1.3.2
@@ -27,6 +28,7 @@ all aspects of the MSX with 100% accuracy.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Verbose compilation
 sed -i 's/@$(COMPILE_ENV)/$(COMPILE_ENV)/' build/main.mk
@@ -140,6 +142,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Jul 28 2012 Hans de Goede <hdegoede at redhat.com> - 0.8.2-4
+- Fix FTBFS
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list