diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-06-06 10:18:36 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-08 08:31:35 +0200 |
commit | b6e2e3bb4d9c4a38657168a75473d48181451be3 (patch) | |
tree | 9057a31f8acdafba1847f0e7ce1fae3cdeb8bfee /meta-efl/recipes-efl/e17 | |
parent | b37564b7355af71595ac48b96bcf7d2087e47c73 (diff) | |
download | meta-openembedded-b6e2e3bb4d9c4a38657168a75473d48181451be3.tar.gz |
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@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl/e17')
-rw-r--r-- | meta-efl/recipes-efl/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch | 34 | ||||
-rw-r--r-- | 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 bb86e9827..000000000 --- a/meta-efl/recipes-efl/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From cff40dddea01d217fc3789c2c8e3337ea2ec34b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 21 Feb 2011 10:29:47 +0100 | ||
4 | Subject: [PATCH] eve: remove unconditional ewk_view_context_menu_forward_event call | ||
5 | |||
6 | * ewk_view_context_menu_forward_event is not available in ewebkit lib (only in API) | ||
7 | after https://bugs.webkit.org/show_bug.cgi?id=51530 | ||
8 | --- | ||
9 | src/bin/view.c | 9 +++++++-- | ||
10 | 1 files changed, 7 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/src/bin/view.c b/src/bin/view.c | ||
13 | index d743d75..5493b20 100644 | ||
14 | --- a/src/bin/view.c | ||
15 | +++ b/src/bin/view.c | ||
16 | @@ -1200,8 +1200,13 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev | ||
17 | return EINA_TRUE; | ||
18 | |||
19 | forward_event: | ||
20 | - if (ev->button == 3) // forward of context menu event is special | ||
21 | - return ewk_view_context_menu_forward_event(sd->base.self, ev); | ||
22 | + /* https://bugs.webkit.org/show_bug.cgi?id=51530 | ||
23 | + * made ewk_view_context_menu_forward_event conditionally available | ||
24 | + * but didn't change it in ewk_view.h, so this compiles fine, but later | ||
25 | + * linker fails. Remove this part here temporary before proper solution is found | ||
26 | + * if (ev->button == 3) // forward of context menu event is special | ||
27 | + * return ewk_view_context_menu_forward_event(sd->base.self, ev); | ||
28 | + */ | ||
29 | |||
30 | /* If we should forward/feed event using parent class method, then | ||
31 | * just do it and do NOT create an animator. See _view_smart_mouse_up(). | ||
32 | -- | ||
33 | 1.7.4.1 | ||
34 | |||
diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb index d324c55d2..2cec0fd5d 100644 --- a/meta-efl/recipes-efl/e17/eve_svn.bb +++ b/meta-efl/recipes-efl/e17/eve_svn.bb | |||
@@ -1,16 +1,17 @@ | |||
1 | DESCRIPTION = " Enlightenment Web Browser" | 1 | DESCRIPTION = " Enlightenment Web Browser" |
2 | LICENSE = "GPL" | 2 | LICENSE = "LGPLv3" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" | ||
3 | DEPENDS = "evas ecore edje elementary webkit-efl" | 4 | DEPENDS = "evas ecore edje elementary webkit-efl" |
4 | PV = "0.3.0.0+svnr${SRCPV}" | 5 | PV = "0.3.0.0+svnr${SRCPV}" |
5 | PR = "r1" | 6 | PR = "r1" |
6 | SRCREV = "${EFL_SRCREV}" | 7 | SRCREV = "${EFL_SRCREV}" |
7 | 8 | ||
8 | inherit e | 9 | inherit e gettext |
9 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep" | 10 | SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep" |
10 | S = "${WORKDIR}/${SRCNAME}" | 11 | S = "${WORKDIR}/${SRCNAME}" |
11 | 12 | ||
12 | SRC_URI += "file://eve-theme-for-smaller-screens.patch \ | 13 | SRC_URI += "file://eve-theme-for-smaller-screens.patch \ |
13 | file://0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch" | 14 | " |
14 | 15 | ||
15 | EXTRA_OECONF = "\ | 16 | EXTRA_OECONF = "\ |
16 | --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ | 17 | --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ |