diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-07-18 17:48:26 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-07-30 23:41:53 +0200 |
| commit | 4e953c2f6644c9ed3061f660fed94767c1db9f5c (patch) | |
| tree | 14c5b8f6a81e5e79f1a51c97823d674542cb59a4 /meta-efl | |
| parent | 9542e2d61a2857887a61b84bc972ab4b59c585f2 (diff) | |
| download | meta-openembedded-contrib-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')
| -rw-r--r-- | meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch | 38 | ||||
| -rw-r--r-- | meta-efl/recipes-efl/e17/eve_svn.bb | 2 |
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 0000000000..a1f14df39b --- /dev/null +++ b/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch @@ -0,0 +1,38 @@ +From 7c25cbf1901e9be1c0bebca6c9bcaa79dbbdf849 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 18 Jul 2012 17:54:50 +0200 +Subject: [PATCH] eve: update for newer webkit-efl + +* ewk_settings_icon_database_icon_object_add was renamed to ewk_settings_icon_database_icon_object_get + in webkit r113173 (see https://bugs.webkit.org/show_bug.cgi?id=82438) + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/bin/chrome.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bin/chrome.c b/src/bin/chrome.c +index e402cad..ee8f0c4 100644 +--- a/src/bin/chrome.c ++++ b/src/bin/chrome.c +@@ -985,7 +985,7 @@ _chrome_state_apply(Evas_Object *chrome, Evas_Object *view) + if (old_icon) evas_object_del(old_icon); + if (url) + { +- favicon = ewk_settings_icon_database_icon_object_add(url, canvas); ++ favicon = ewk_settings_icon_database_icon_object_get(url, canvas); + if (favicon) + elm_object_part_content_set(text_url, "icon", favicon); + } +@@ -2456,7 +2456,7 @@ more_content_get(void *data, Evas_Object *obj, const char *part) + { + Evas_Object *chrome = evas_object_data_get(obj, "chrome"); + Evas *canvas = evas_object_evas_get(chrome); +- icon = ewk_settings_icon_database_icon_object_add(mmi->next, canvas); ++ icon = ewk_settings_icon_database_icon_object_get(mmi->next, canvas); + } + return icon; + } +-- +1.7.8.6 + diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb index d760c4a85a..9528ff3fbc 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" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" DEPENDS = "evas ecore edje elementary webkit-efl" PV = "0.3.0.0+svnr${SRCPV}" +PR = "r1" SRCREV = "${EFL_SRCREV}" inherit e gettext @@ -14,6 +15,7 @@ do_configure_prepend() { } SRC_URI += "file://eve-theme-for-smaller-screens.patch \ + file://0001-eve-update-for-newer-webkit-efl.patch \ " EXTRA_OECONF = "\ |