[oe-commits] Martin Jansa : eve: update LICENSE fields and remove patch applied upstream

git version control git at git.openembedded.org
Wed Jun 8 06:34:27 UTC 2011


Module: meta-openembedded.git
Branch: master
Commit: b6e2e3bb4d9c4a38657168a75473d48181451be3
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b6e2e3bb4d9c4a38657168a75473d48181451be3

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Jun  6 10:18:36 2011 +0200

eve: update LICENSE fields and remove patch applied upstream

* context menu was removed completely in r59455
* add LIC_FILES_CHKSUM
* fix LICENSE
* add gettext to inherit

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

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

diff --git a/meta-efl/recipes-efl/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch b/meta-efl/recipes-efl/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch
deleted file mode 100644
index bb86e98..0000000
--- a/meta-efl/recipes-efl/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb
index d324c55..2cec0fd 100644
--- a/meta-efl/recipes-efl/e17/eve_svn.bb
+++ b/meta-efl/recipes-efl/e17/eve_svn.bb
@@ -1,16 +1,17 @@
 DESCRIPTION = " Enlightenment Web Browser"
-LICENSE = "GPL"
+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
+inherit e gettext
 SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
 
 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 \





More information about the Openembedded-commits mailing list