fontconfig: apply a patch by Philipp Zabel to stop xtscal from crashing

diff --git a/packages/fontconfig/files/one-j-too-many.patch b/packages/fontconfig/files/one-j-too-many.patch
new file mode 100644 (file)
index 0000000..04d8e02
--- /dev/null
+++ b/packages/fontconfig/files/one-j-too-many.patch
@@ -0,0 +1,24 @@
+--- fontconfig-2.3.95/src/fcname.c.orig        2006-07-26 15:20:01.469770388 +0200
++++ fontconfig-2.3.95/src/fcname.c     2006-07-26 15:22:38.415239062 +0200
+@@ -305,17 +305,16 @@
+ FcObjectPtrU (FcObjectPtr si)
+ {
+     const FcObjectTypeList  *l;
+-    int i, j;
++    int i;
+ 
+     if (si > 0)
+     {
+         if (si < biggest_known_ntypes)
+             return biggest_known_types[si].object;
+ 
+-        j = 0;
+         for (l = _FcObjectTypes; l; l = l->next)
+-            for (i = 0; i < l->ntypes; i++, j++)
+-                if (j == si)
++            for (i = 0; i < l->ntypes; i++)
++                if (l->basic_offset+i == si)
+                     return l->types[i].object;
+     }
+ 
+

diff --git a/packages/fontconfig/fontconfig_2.3.95.bb b/packages/fontconfig/fontconfig_2.3.95.bb
index 57f8489..f314b13 100644 (file)
--- a/packages/fontconfig/fontconfig_2.3.95.bb
+++ b/packages/fontconfig/fontconfig_2.3.95.bb
@@ -3,9 +3,10 @@ LICENSE = "BSD"
 DESCRIPTION = "A library for configuring and customizing font access."
 DEPENDS = "expat freetype freetype-native zlib"
 
-SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+          file://one-j-too-many.patch;patch=1"
 
-PR = "r0"
+PR = "r1"
 
 PACKAGES =+ "fontconfig-utils "
 FILES_fontconfig-utils = "${bindir}/*"