Patchwork [meta-oe,meta-efl,13/46] eve: drop patch applied upstream

login
mail settings
Submitter Martin Jansa
Date Aug. 10, 2012, 1:43 p.m.
Message ID <e544b53522b39b2c04b8d881f18fde6973b992fb.1344601517.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/34201/
State Accepted
Commit ef5df8eecc1b01c8423e3f60dc7552d09e3e565c
Headers show

Comments

Martin Jansa - Aug. 10, 2012, 1:43 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../eve/0001-eve-update-for-newer-webkit-efl.patch |   38 --------------------
 meta-efl/recipes-efl/e17/eve_svn.bb                |    2 -
 2 files changed, 0 insertions(+), 40 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch

Patch

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 a1f14df..0000000
--- a/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch
+++ /dev/null
@@ -1,38 +0,0 @@ 
-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 9528ff3..d760c4a 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"
 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
@@ -15,7 +14,6 @@  do_configure_prepend() {
 }
 
 SRC_URI += "file://eve-theme-for-smaller-screens.patch \
-  file://0001-eve-update-for-newer-webkit-efl.patch \
 "
 
 EXTRA_OECONF = "\