summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch')
-rw-r--r--meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
deleted file mode 100644
index 88f5d7091b..0000000000
--- a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1matchbox environment start fail on x86-64 target, while ok on x86 target. Root
2cause is libmatchbox use "0"(int) as termination indicator when calling
3XftFontOpen, which in turn called FcPatternVapBuild(in fontconfig). It try to
4get the "0" as char* and fetch wrong value, as int and char* has different size
5on x86-64. This patch forces a NULL pointer as terminator to fix it.
6
7Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
8
9Upstream-Status: Accepted
10
11Index: libmatchbox-1.9/libmb/mbexp.c
12===================================================================
13--- libmatchbox-1.9.orig/libmb/mbexp.c 2010-08-28 06:33:25.000000000 +0800
14+++ libmatchbox-1.9/libmb/mbexp.c 2010-08-28 06:30:05.000000000 +0800
15@@ -348,7 +348,7 @@
16 XFT_SIZE, XftTypeDouble , (double)font->pt_size,
17 XFT_WEIGHT, XftTypeInteger, weight,
18 XFT_SLANT, XftTypeInteger , slant,
19- 0);
20+ NULL);
21
22 if (font->font != NULL ) result = 2;
23