3 files changed, 29 insertions, 0 deletions
diff --git a/packages/xorg-lib/libxfont/no-scalable-crash.patch b/packages/xorg-lib/libxfont/no-scalable-crash.patch
new file mode 100644
index 0000000000..90bded6fba
--- /dev/null
+++ b/packages/xorg-lib/libxfont/no-scalable-crash.patch
@@ -0,0 +1,22 @@
+--- /tmp/fontdir.c	2006-08-01 16:17:22.000000000 +0200
++++ libXfont-1.2.0/src/fontfile/fontdir.c	2006-08-01 16:20:37.248306000 +0200
+@@ -695,6 +695,11 @@
+      */
+     if (isscale)
+     {
++	/* If the fontname says it is scalable, make sure that the
++  	 * renderer supports OpenScalable and GetInfoScalable.
++	 */
++       if (renderer->OpenScalable && renderer->GetInfoScalable)
++       {
+ 	if (vals.values_supplied & SIZE_SPECIFY_MASK)
+ 	{
+ 	    bzero((char *)&zeroVals, sizeof(zeroVals));
+@@ -794,6 +799,7 @@
+                                            bitmap->name.name);
+             }
+ 	}
++       }
+     }
+     return TRUE;
+ }
diff --git a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
index 07fbf5f9a6..68148a3657 100644
--- a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
@@ -1,5 +1,9 @@
 include xorg-lib-common.inc
 
+PR = "r1"
+SRC_URI += "file://no-scalable-crash.patch;patch=1"
+
+
 DESCRIPTION = "X font library (used by the X server)."
 LICENSE= "BSD-X"
 PRIORITY = "optional"
diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
index c0fb08edea..af511be866 100644
--- a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
+++ b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
@@ -1,10 +1,13 @@
 include xorg-lib-common.inc
 
+PR = "r1"
+
 DESCRIPTION = "X font library (used by the X server)."
 LICENSE= "BSD-X"
 PRIORITY = "optional"
 
 SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2"
+SRC_URI += "file://no-scalable-crash.patch;patch=1"
 
 DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"