[oe-commits] Martin Jansa : eve: fix build with newer webkit-efl

[git version control]

Module: openembedded.git
Branch: testing-next
Commit: fb0a796b1fc6612168a187a2883fc7b5cd9d1240
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fb0a796b1fc6612168a187a2883fc7b5cd9d1240

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Feb 21 10:31:52 2011 +0100

eve: fix build with newer webkit-efl

---

 ...unconditional-ewk_view_context_menu_forwa.patch |   34 ++++++++++++++++++++
 recipes/e17/eve_svn.bb                             |    4 ++-
 2 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/recipes/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch b/recipes/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch
new file mode 100644
index 0000000..bb86e98
--- /dev/null
+++ b/recipes/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch
@@ -0,0 +1,34 @@
+From cff40dddea01d217fc3789c2c8e3337ea2ec34b7 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Mon, 21 Feb 2011 10:29:47 +0100
+Subject: [PATCH] eve: remove unconditional ewk_view_context_menu_forward_event call
+
+* ewk_view_context_menu_forward_event is not available in ewebkit lib (only in API)
+  after https://bugs.webkit.org/show_bug.cgi?id=51530
+---
+ src/bin/view.c |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/view.c b/src/bin/view.c
+index d743d75..5493b20 100644
+--- a/src/bin/view.c
++++ b/src/bin/view.c
+@@ -1200,8 +1200,13 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev
+    return EINA_TRUE;
+ 
+ forward_event:
+-   if (ev->button == 3) // forward of context menu event is special
+-      return ewk_view_context_menu_forward_event(sd->base.self, ev);
++   /* https://bugs.webkit.org/show_bug.cgi?id=51530 
++    * made ewk_view_context_menu_forward_event conditionally available
++    * but didn't change it in ewk_view.h, so this compiles fine, but later
++    * linker fails. Remove this part here temporary before proper solution is found
++    * if (ev->button == 3) // forward of context menu event is special
++    *   return ewk_view_context_menu_forward_event(sd->base.self, ev);
++    */
+ 
+    /* If we should forward/feed event using parent class method, then
+     * just do it and do NOT create an animator. See _view_smart_mouse_up().
+-- 
+1.7.4.1
+
diff --git a/recipes/e17/eve_svn.bb b/recipes/e17/eve_svn.bb
index d7f93e9..d324c55 100644
--- a/recipes/e17/eve_svn.bb
+++ b/recipes/e17/eve_svn.bb
@@ -2,13 +2,15 @@ DESCRIPTION = " Enlightenment Web Browser"
 LICENSE = "GPL"
 DEPENDS = "evas ecore edje elementary webkit-efl"
 PV = "0.3.0.0+svnr${SRCPV}"
+PR = "r1"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e
 SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
 
-SRC_URI += "file://eve-theme-for-smaller-screens.patch"
+SRC_URI += "file://eve-theme-for-smaller-screens.patch \
+            file://0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch"
 
 EXTRA_OECONF = "\
   --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \