summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2012-05-30 09:08:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-14 10:23:48 (GMT)
commit89c0e81273258184f851afdc7d42bbe38a785123 (patch)
tree8a1c648f1c12bef64a786fbdc130b3f7c981cfca
parent78a5471a29fca1c61d1fbfe164e0ad3b34f5e8d2 (diff)
downloadpoky-89c0e81273258184f851afdc7d42bbe38a785123.tar.gz
webkit-gtk: Use glib as unicode backend to avoid browser crash
webkit-gtk depends on ICU for the unicode, but ICU is not safe when build and target system owns different endian. ICU's community is not responsive to make a patch for this, so glib is used as work around here. [YOCTO #1570] got fixed (From OE-Core rev: df83a9480ba7b2fd2bcc0a92932d51434d7795a0) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_svn.bb10
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 7db573d..9381486 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -10,12 +10,13 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
10DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3" 10DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3"
11DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" 11DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
12DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3" 12DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
13DEPENDS_append_qemuppc += "pango"
13 14
14SRCREV_FORMAT = "source" 15SRCREV_FORMAT = "source"
15 16
16SRCREV = "101488" 17SRCREV = "101488"
17PV = "1.7.2+svnr${SRCPV}" 18PV = "1.7.2+svnr${SRCPV}"
18PR = "r4" 19PR = "r5"
19 20
20SRC_URI = "\ 21SRC_URI = "\
21 svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ 22 svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -47,6 +48,13 @@ EXTRA_OECONF = "\
47 UNICODE_CFLAGS=-D_REENTRANT \ 48 UNICODE_CFLAGS=-D_REENTRANT \
48 " 49 "
49 50
51#default unicode backend icu breaks in cross-compile when target and host owns different endian type
52EXTRA_OECONF_append_qemuppc += "--with-unicode-backend=glib"
53
54CPPFLAGS_append_qemuppc += "-I${STAGING_INCDIR}/pango-1.0 \
55 -I${STAGING_LIBDIR}/glib-2.0/include \
56 -I${STAGING_INCDIR}/glib-2.0"
57
50EXTRA_AUTORECONF = " -I Source/autotools " 58EXTRA_AUTORECONF = " -I Source/autotools "
51 59
52 60