summaryrefslogtreecommitdiff
path: root/packages/xorg-lib/libxfont
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-08-01 14:28:58 +0000
committerKoen Kooi <koen@openembedded.org>2006-08-01 14:28:58 +0000
commitd7e256edf3063aaa9454c3d7e4dfa464a7d6f9a3 (patch)
tree13f52014ff6f4868fb05cb8493f775f55009e826 /packages/xorg-lib/libxfont
parenta4a1644dec42a8dfe6a4950592f36fc9d43e1bb8 (diff)
libxfont: add (rediffed) version of scalable patch that seems to have gotten lost with the update to xorg 7.x
Diffstat (limited to 'packages/xorg-lib/libxfont')
-rw-r--r--packages/xorg-lib/libxfont/no-scalable-crash.patch22
1 files changed, 22 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;
+ }