[openttd-opengfx] fix gcc 4.8 patch

Felix Kaechele heffer at fedoraproject.org
Sat Mar 23 10:52:44 UTC 2013


commit 94f0750e64a80b33fbede42879d3b5512f80edfd
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sat Mar 23 11:52:08 2013 +0100

    fix gcc 4.8 patch

 changeset_rbd33fb0e864a.diff  |   12 ------------
 opengfx-0.4.6.1-gcc-4.8.patch |   12 ++++++++++++
 openttd-opengfx.spec          |    8 +++++---
 3 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/opengfx-0.4.6.1-gcc-4.8.patch b/opengfx-0.4.6.1-gcc-4.8.patch
new file mode 100644
index 0000000..12a7683
--- /dev/null
+++ b/opengfx-0.4.6.1-gcc-4.8.patch
@@ -0,0 +1,12 @@
+diff -ru opengfx-0.4.6.1-source.orig/scripts/Makefile.def opengfx-0.4.6.1-source/scripts/Makefile.def
+--- opengfx-0.4.6.1-source.orig/scripts/Makefile.def	2013-03-23 11:46:36.003847495 +0100
++++ opengfx-0.4.6.1-source/scripts/Makefile.def	2013-03-23 11:47:24.699945875 +0100
+@@ -14,7 +14,7 @@
+ 
+ 
+ CC             ?= gcc
+-CC_FLAGS       ?= -C -E - <
++CC_FLAGS       ?= -nostdinc -C -E - <
+ 
+ GIMP           ?= $(shell [ `which gimp 2>/dev/null` ] && echo "gimp" || echo "")
+ GIMP_FLAGS     ?= -n -i -b - <
diff --git a/openttd-opengfx.spec b/openttd-opengfx.spec
index b91b930..a3fba05 100644
--- a/openttd-opengfx.spec
+++ b/openttd-opengfx.spec
@@ -3,7 +3,7 @@
 
 Name:           openttd-opengfx
 Version:        0.4.6.1
-Release:        2%{?prever:.%{prever}}%{?dist}
+Release:        3%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
@@ -11,8 +11,7 @@ License:        GPLv2
 URL:            http://dev.openttdcoop.org/projects/opengfx
 Source0:        http://bundles.openttdcoop.org/opengfx/releases/%{version}%{?prever:-%{prever}}/%{realname}-%{version}%{?prever:-%{prever}}-source.tar.xz
 # Fix compilation on F19+
-# taken from upstream git
-Patch0:         changeset_rbd33fb0e864a.diff
+Patch0:         opengfx-0.4.6.1-gcc-4.8.patch
 
 BuildArch:      noarch
 
@@ -63,6 +62,9 @@ make check
 
 
 %changelog
+* Sat Mar 23 2013 Felix Kaechele <heffer at fedoraproject.org> - 0.4.6.1-3
+- fix gcc 4.8 patch
+
 * Sat Mar 23 2013 Felix Kaechele <heffer at fedoraproject.org> - 0.4.6.1-2
 - fix compilation on F19+
 - specfile cleanups


More information about the scm-commits mailing list