Package: openttd
Version: 1.2.1-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

the version checks in openttd break when a version goes beyond 9
e.g. fontconfig 2.10 in ubuntu quantal fails as it only checks the first two
numbers against 22.
attached a hacky patch to fix fontconfig.
Upstream should clean this up for all the other version checks too.

I haven't forwarded it as I have no account on their tracker.



-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal-proposed'), (500, 'quantal'), (100, 'quantal-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.5.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru openttd-1.2.1/debian/changelog openttd-1.2.1/debian/changelog
diff -Nru openttd-1.2.1/debian/patches/fix-fontconfig-check.patch openttd-1.2.1/debian/patches/fix-fontconfig-check.patch
--- openttd-1.2.1/debian/patches/fix-fontconfig-check.patch	1970-01-01 01:00:00.000000000 +0100
+++ openttd-1.2.1/debian/patches/fix-fontconfig-check.patch	2012-10-02 01:02:20.000000000 +0200
@@ -0,0 +1,25 @@
+Description: fix fontconfig version check for 2.10
+Author: Julian Taylor <jtay...@ubuntu.com>
+--- a/config.lib
++++ b/config.lib
+@@ -2815,13 +2815,17 @@
+ 
+ 	version=`$fontconfig_config --modversion 2>/dev/null`
+ 	ret=$?
+-	shortversion=`echo $version | cut -c 1,3`
++        majorversion=`echo $version | cut -d . -f 1`
++        minorversion=`echo $version | cut -d . -f 2`
+ 	log 2 "executing $fontconfig_config --modversion"
+ 	log 2 "  returned $version"
+ 	log 2 "  exit code $ret"
+ 
+-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -le "22" ]; then
+-		if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]; then
++	if [ -z "$majorversion" ] || [ "$ret" != "0" ] ||
++	   [ "$majorversion" -lt 2 ] ||
++    	   [ -n "$minorversion" -a $majorversion -eq 2 -a $minorversion -lt 3 ]; then
++		if [ -n "$majorversion" ] && [ -n "$minorversion" ] &&
++		   [ $majorversion -lt 2 ] || [ $majorversion -eq 2 -a $minorversion -lt 3 ]; then
+ 			log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled"
+ 		else
+ 			log 1 "checking libfontconfig... not found"
diff -Nru openttd-1.2.1/debian/patches/series openttd-1.2.1/debian/patches/series
--- openttd-1.2.1/debian/patches/series	2012-09-19 09:51:05.000000000 +0200
+++ openttd-1.2.1/debian/patches/series	2012-10-02 00:43:06.000000000 +0200
@@ -1,2 +1,3 @@
 run-openttd-wrapper.patch
 cve-2012-3436.patch
+fix-fontconfig-check.patch

Reply via email to