diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2012-05-30 17:08:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-14 11:23:48 +0100 |
commit | 89c0e81273258184f851afdc7d42bbe38a785123 (patch) | |
tree | 8a1c648f1c12bef64a786fbdc130b3f7c981cfca /meta/recipes-sato | |
parent | 78a5471a29fca1c61d1fbfe164e0ad3b34f5e8d2 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/webkit/webkit-gtk_svn.bb | 10 |
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 7db573d056..9381486e20 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 | |||
10 | DEPENDS = "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" | 10 | DEPENDS = "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" |
11 | DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" | 11 | DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" |
12 | DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3" | 12 | DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3" |
13 | DEPENDS_append_qemuppc += "pango" | ||
13 | 14 | ||
14 | SRCREV_FORMAT = "source" | 15 | SRCREV_FORMAT = "source" |
15 | 16 | ||
16 | SRCREV = "101488" | 17 | SRCREV = "101488" |
17 | PV = "1.7.2+svnr${SRCPV}" | 18 | PV = "1.7.2+svnr${SRCPV}" |
18 | PR = "r4" | 19 | PR = "r5" |
19 | 20 | ||
20 | SRC_URI = "\ | 21 | SRC_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 | ||
52 | EXTRA_OECONF_append_qemuppc += "--with-unicode-backend=glib" | ||
53 | |||
54 | CPPFLAGS_append_qemuppc += "-I${STAGING_INCDIR}/pango-1.0 \ | ||
55 | -I${STAGING_LIBDIR}/glib-2.0/include \ | ||
56 | -I${STAGING_INCDIR}/glib-2.0" | ||
57 | |||
50 | EXTRA_AUTORECONF = " -I Source/autotools " | 58 | EXTRA_AUTORECONF = " -I Source/autotools " |
51 | 59 | ||
52 | 60 | ||