[packages/openttd] - fixed fontconfig > 2.9 detection

baggins baggins at pld-linux.org
Mon Sep 24 09:20:41 CEST 2012


commit d33d232621179a334f3f5db19628d42efb60b694
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 24 09:20:22 2012 +0200

    - fixed fontconfig > 2.9 detection

 fontconfig2.10.patch | 11 +++++++++++
 openttd.spec         |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/openttd.spec b/openttd.spec
index c35b368..6e2e3ec 100644
--- a/openttd.spec
+++ b/openttd.spec
@@ -15,6 +15,7 @@ Source1:	%{name}.desktop
 Source2:	%{name}-server.desktop
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-libiconv.patch
+Patch2:		fontconfig2.10.patch
 URL:		http://www.openttd.org/
 BuildRequires:	SDL-devel
 BuildRequires:	fontconfig-devel
@@ -82,6 +83,7 @@ graficzny klient OpenTTD również zawiera taką funkcjonalność.
 %setup -q
 %{?with_home_etc:%patch0 -p1}
 %patch1 -p1
+%patch2 -p1
 
 # Let's pldize
 find src/lang/ -type f -exec %{__sed} -i 's/:Unix/:PLD Linux/' \{\} \;
diff --git a/fontconfig2.10.patch b/fontconfig2.10.patch
new file mode 100644
index 0000000..b94a491
--- /dev/null
+++ b/fontconfig2.10.patch
@@ -0,0 +1,11 @@
+--- openttd-1.2.2/config.lib~	2012-09-24 09:09:54.018404061 +0200
++++ openttd-1.2.2/config.lib	2012-09-24 09:17:48.355053988 +0200
+@@ -2831,7 +2831,7 @@
+ 
+ 	version=`$fontconfig_config --modversion 2>/dev/null`
+ 	ret=$?
+-	shortversion=`echo $version | cut -c 1,3`
++	shortversion=`echo $version | cut -d . -f 1,2 --output-delimiter=`
+ 	log 2 "executing $fontconfig_config --modversion"
+ 	log 2 "  returned $version"
+ 	log 2 "  exit code $ret"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openttd.git/commitdiff/d33d232621179a334f3f5db19628d42efb60b694



More information about the pld-cvs-commit mailing list