[dosbox] Adopt openSUSE's gcc46.patch (Fix FTBFS BZ#715677).
corsepiu
corsepiu at fedoraproject.org
Thu Jun 30 08:53:57 UTC 2011
commit dec258c093549cf5bd1fb0460cc7adfe1c4f39bf
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Thu Jun 30 10:53:45 2011 +0200
Adopt openSUSE's gcc46.patch (Fix FTBFS BZ#715677).
dosbox-0.74-gcc46.patch | 10 ++++++++++
dosbox.spec | 9 ++++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/dosbox-0.74-gcc46.patch b/dosbox-0.74-gcc46.patch
new file mode 100644
index 0000000..07b7c7c
--- /dev/null
+++ b/dosbox-0.74-gcc46.patch
@@ -0,0 +1,10 @@
+--- include/dos_inc.h 2010-05-10 19:43:54.000000000 +0200
++++ include/dos_inc.h 2011-03-16 09:46:24.430008904 +0100
+@@ -27,6 +27,7 @@
+ #ifndef DOSBOX_MEM_H
+ #include "mem.h"
+ #endif
++#include <stddef.h>
+
+ #ifdef _MSC_VER
+ #pragma pack (1)
diff --git a/dosbox.spec b/dosbox.spec
index 62e5ca3..b35fb1b 100644
--- a/dosbox.spec
+++ b/dosbox.spec
@@ -1,6 +1,6 @@
Name: dosbox
Version: 0.74
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: x86/DOS emulator with sound and graphics
@@ -10,6 +10,9 @@ URL: http://dosbox.sf.net
Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: dosbox.desktop
Source2: dosbox.png
+# From openSUSE:
+# https://build.opensuse.org/package/view_file?file=gcc46.patch&package=dosbox&project=Emulators
+Patch0: %{name}-%{version}-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libpng-devel
@@ -36,6 +39,7 @@ of the old classics that don't run on your new computer!
%prep
%setup -q
+%patch0 -p0
%build
%configure --enable-core-inline
@@ -73,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
+* Thu Jun 30 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.74-3
+- Adopt openSUSE's gcc46.patch (Fix FTBFS BZ#715677).
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.74-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list