From 0d7bcdf9fd1bfaebfb5f0b99606e85a8e0229bba Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Thu, 2 Sep 2010 08:22:10 +0800 Subject: 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 --- meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb') diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb index 3cdcd324f4..98c901f678 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb @@ -1,13 +1,14 @@ require libmatchbox.inc PV = "1.7+svnr${SRCREV}" -PR = "r4" +PR = "r5" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://configure_fixes.patch;patch=1 \ file://check.m4 \ - file://16bppfixes.patch;patch=1" + file://16bppfixes.patch;patch=1 \ + file://matchbox-start-fix.patch;patch=1" S = "${WORKDIR}/libmatchbox" -- cgit v1.2.3-54-g00ecf