summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-07-18 17:48:26 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2012-07-30 23:41:53 +0200
commit4e953c2f6644c9ed3061f660fed94767c1db9f5c (patch)
tree14c5b8f6a81e5e79f1a51c97823d674542cb59a4 /meta-efl/recipes-efl
parent9542e2d61a2857887a61b84bc972ab4b59c585f2 (diff)
downloadmeta-openembedded-4e953c2f6644c9ed3061f660fed94767c1db9f5c.tar.gz
eve: add patch to build against newer webkit-efl
* otherwise fails at runtime: CRI<627>: /OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/webkit-efl-1.9.5+svnr120144-r0/src/Source/WebKit/efl/ewk/ewk_view.cpp:1264 ewk_view_base_smart_set() Ewk_View_Smart_Class 0x617f00 is version 4 while 5 was expected. CRI<627>: /OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/webkit-efl-1.9.5+svnr120144-r0/src/Source/WebKit/efl/ewk/ewk_view.cpp:1264 ewk_view_base_smart_set() Ewk_View_Smart_Class 0x6180c0 is version 4 while 5 was expected. eve[627]: segfault at 0 ip (null) sp 00007fff7ee1fb18 error 14 in eve[400000+18000] Segmentation fault Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl')
-rw-r--r--meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch38
-rw-r--r--meta-efl/recipes-efl/e17/eve_svn.bb2
2 files changed, 40 insertions, 0 deletions
diff --git a/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch b/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch
new file mode 100644
index 000000000..a1f14df39
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch
@@ -0,0 +1,38 @@
1From 7c25cbf1901e9be1c0bebca6c9bcaa79dbbdf849 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 18 Jul 2012 17:54:50 +0200
4Subject: [PATCH] eve: update for newer webkit-efl
5
6* ewk_settings_icon_database_icon_object_add was renamed to ewk_settings_icon_database_icon_object_get
7 in webkit r113173 (see https://bugs.webkit.org/show_bug.cgi?id=82438)
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 src/bin/chrome.c | 4 ++--
12 1 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/bin/chrome.c b/src/bin/chrome.c
15index e402cad..ee8f0c4 100644
16--- a/src/bin/chrome.c
17+++ b/src/bin/chrome.c
18@@ -985,7 +985,7 @@ _chrome_state_apply(Evas_Object *chrome, Evas_Object *view)
19 if (old_icon) evas_object_del(old_icon);
20 if (url)
21 {
22- favicon = ewk_settings_icon_database_icon_object_add(url, canvas);
23+ favicon = ewk_settings_icon_database_icon_object_get(url, canvas);
24 if (favicon)
25 elm_object_part_content_set(text_url, "icon", favicon);
26 }
27@@ -2456,7 +2456,7 @@ more_content_get(void *data, Evas_Object *obj, const char *part)
28 {
29 Evas_Object *chrome = evas_object_data_get(obj, "chrome");
30 Evas *canvas = evas_object_evas_get(chrome);
31- icon = ewk_settings_icon_database_icon_object_add(mmi->next, canvas);
32+ icon = ewk_settings_icon_database_icon_object_get(mmi->next, canvas);
33 }
34 return icon;
35 }
36--
371.7.8.6
38
diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb
index d760c4a85..9528ff3fb 100644
--- a/meta-efl/recipes-efl/e17/eve_svn.bb
+++ b/meta-efl/recipes-efl/e17/eve_svn.bb
@@ -3,6 +3,7 @@ LICENSE = "LGPLv3"
3LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" 3LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
4DEPENDS = "evas ecore edje elementary webkit-efl" 4DEPENDS = "evas ecore edje elementary webkit-efl"
5PV = "0.3.0.0+svnr${SRCPV}" 5PV = "0.3.0.0+svnr${SRCPV}"
6PR = "r1"
6SRCREV = "${EFL_SRCREV}" 7SRCREV = "${EFL_SRCREV}"
7 8
8inherit e gettext 9inherit e gettext
@@ -14,6 +15,7 @@ do_configure_prepend() {
14} 15}
15 16
16SRC_URI += "file://eve-theme-for-smaller-screens.patch \ 17SRC_URI += "file://eve-theme-for-smaller-screens.patch \
18 file://0001-eve-update-for-newer-webkit-efl.patch \
17" 19"
18 20
19EXTRA_OECONF = "\ 21EXTRA_OECONF = "\