summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-07-26 09:52:44 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2012-08-20 09:57:40 +0200
commitef5df8eecc1b01c8423e3f60dc7552d09e3e565c (patch)
treecad183be4b141b7bc3260c564f6a54690d936d91 /meta-efl/recipes-efl
parent6d175440566485f67547aa7900d5441eb7a4c920 (diff)
downloadmeta-openembedded-ef5df8eecc1b01c8423e3f60dc7552d09e3e565c.tar.gz
eve: drop patch applied upstream
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, 0 insertions, 40 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
deleted file mode 100644
index a1f14df39..000000000
--- a/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
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 9528ff3fb..d760c4a85 100644
--- a/meta-efl/recipes-efl/e17/eve_svn.bb
+++ b/meta-efl/recipes-efl/e17/eve_svn.bb
@@ -3,7 +3,6 @@ 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"
7SRCREV = "${EFL_SRCREV}" 6SRCREV = "${EFL_SRCREV}"
8 7
9inherit e gettext 8inherit e gettext
@@ -15,7 +14,6 @@ do_configure_prepend() {
15} 14}
16 15
17SRC_URI += "file://eve-theme-for-smaller-screens.patch \ 16SRC_URI += "file://eve-theme-for-smaller-screens.patch \
18 file://0001-eve-update-for-newer-webkit-efl.patch \
19" 17"
20 18
21EXTRA_OECONF = "\ 19EXTRA_OECONF = "\