diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-09-02 08:22:10 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-02 09:53:49 +0100 |
commit | 0d7bcdf9fd1bfaebfb5f0b99606e85a8e0229bba (patch) | |
tree | 67ef90b98f281032c1e49d7adf0b11e5e9a7889f /meta/recipes-graphics/libmatchbox/files | |
parent | 36aa00b6f704761b6b518729befc936af674c68d (diff) | |
download | poky-0d7bcdf9fd1bfaebfb5f0b99606e85a8e0229bba.tar.gz |
libmatchbox: Fix the matchbox environment start failure on x86-64 target.
x86 target works well. Root cause is libmatchbox use "0"(int) as termination
indicator when calling XftFontOpen, which in turn called FcPatternVapBuild(in
fontconfig). It try to get the "0" as char* and fetch wrong value, as int and
char* has different size on x86-64. This patch forces a NULL pointer as
terminator to fix it.
[BUGID #234] is fixed by this
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-graphics/libmatchbox/files')
-rw-r--r-- | meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch new file mode 100644 index 0000000000..04460a3114 --- /dev/null +++ b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | matchbox environment start fail on x86-64 target, while ok on x86 target. Root | ||
2 | cause is libmatchbox use "0"(int) as termination indicator when calling | ||
3 | XftFontOpen, which in turn called FcPatternVapBuild(in fontconfig). It try to | ||
4 | get the "0" as char* and fetch wrong value, as int and char* has different size | ||
5 | on x86-64. This patch forces a NULL pointer as terminator to fix it. | ||
6 | |||
7 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
8 | |||
9 | Index: libmatchbox-1.9/libmb/mbexp.c | ||
10 | =================================================================== | ||
11 | --- libmatchbox-1.9.orig/libmb/mbexp.c 2010-08-28 06:33:25.000000000 +0800 | ||
12 | +++ libmatchbox-1.9/libmb/mbexp.c 2010-08-28 06:30:05.000000000 +0800 | ||
13 | @@ -348,7 +348,7 @@ | ||
14 | XFT_SIZE, XftTypeDouble , (double)font->pt_size, | ||
15 | XFT_WEIGHT, XftTypeInteger, weight, | ||
16 | XFT_SLANT, XftTypeInteger , slant, | ||
17 | - 0); | ||
18 | + NULL); | ||
19 | |||
20 | if (font->font != NULL ) result = 2; | ||
21 | |||