[meta-efl][PATCH 0/3] Pull request #7

[meta-efl][PATCH 0/3] Pull request #7

[Martin Jansa]

Hi, please merge following patches.

The following changes since commit 92492f8596ae74044f0cbf1813c22ba6f18f742c:

  systemd-compat-units: disable old style 'networking' script for the time being (2011-06-06 13:08:15 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/meta-efl
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-efl

Martin Jansa (3):
  e-base,e-wm: bump EFL_SRCREV and remove illume1 from e-wm
  eve: update LICENSE fields and remove patch applied upstream
  webkit-efl: import from OE rev
    d4f0211e2078d5033ae0dee74664de5520d8392d

 meta-efl/classes/e-base.bbclass                    |    2 +-
 .../e17/e-wm/illume-disable-screensaver.patch      |   13 ------
 .../recipes-efl/e17/e-wm/illume-flaunch-fix.patch  |   15 -------
 meta-efl/recipes-efl/e17/e-wm_svn.bb               |   17 +-------
 ...unconditional-ewk_view_context_menu_forwa.patch |   34 ----------------
 meta-efl/recipes-efl/e17/eve_svn.bb                |    7 ++-
 .../webkit/webkit-efl/revert.r78057.patch          |   19 +++++++++
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |   42 ++++++++++++++++++++
 8 files changed, 67 insertions(+), 82 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch
 delete mode 100644 meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch
 delete mode 100644 meta-efl/recipes-efl/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch
 create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch
 create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb

-- 
1.7.5.3

[meta-efl][PATCH 1/3] e-base, e-wm: bump EFL_SRCREV and remove illume1 from e-wm

[Martin Jansa]

* illume1 and it's theme were removed in r59932, r59933, r59936, r59982

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/classes/e-base.bbclass                    |    2 +-
 .../e17/e-wm/illume-disable-screensaver.patch      |   13 -------------
 .../recipes-efl/e17/e-wm/illume-flaunch-fix.patch  |   15 ---------------
 meta-efl/recipes-efl/e17/e-wm_svn.bb               |   17 +----------------
 4 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch
 delete mode 100644 meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch

diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index 26639f6..e87a96b 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
 # usually tracks svn trunk HEAD
-EFL_SRCREV ?= "59463"
+EFL_SRCREV ?= "59985"
 # revision when 1.0.0 was released, for recipes which don't need rebuild so often
 EFL_SRCREV_1.0.0 ?= "56356"
 
diff --git a/meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch b/meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch
deleted file mode 100644
index 984895c..0000000
--- a/meta-efl/recipes-efl/e17/e-wm/illume-disable-screensaver.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: e/config/illume/e.src
-===================================================================
---- e.orig/config/illume/e.src	2009-01-30 23:34:37.000000000 +0100
-+++ e/config/illume/e.src	2009-01-30 23:34:54.000000000 +0100
-@@ -665,7 +665,7 @@
-   value "display_res_height" int: 1;
-   value "display_res_hz" int: 0;
-   value "display_res_rotation" int: 0;
--  value "screensaver_enable" int: 1;
-+  value "screensaver_enable" int: 0;
-   value "screensaver_timeout" int: 30;
-   value "screensaver_interval" int: 5;
-   value "screensaver_blanking" int: 2;
diff --git a/meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch b/meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch
deleted file mode 100644
index 5aab3b5..0000000
--- a/meta-efl/recipes-efl/e17/e-wm/illume-flaunch-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- e/src/modules/illume/e_flaunch.c	2010-02-09 22:33:25.000000000 +0100
-+++ e/src/modules/illume/e_flaunch.c	2010-02-09 22:33:25.000000000 +0100
-@@ -97,10 +97,10 @@
-    int num = 0, max, count;
-    
-    // FIXME: 3 should become config here
--   max = 10;
-+   max = 3;
-    // for now just look for any apps in "category" 'Bar' and add the first 3
-    // FIXME: category should be configurable... 
--   bar_desktops = efreet_util_desktop_category_list("System");
-+   bar_desktops = efreet_util_desktop_category_list("Bar");
-    if (bar_desktops)
-      {
- 	Efreet_Desktop *desktop;
diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb
index baed233..b32634d 100644
--- a/meta-efl/recipes-efl/e17/e-wm_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb
@@ -17,9 +17,7 @@ SRC_URI = "\
 "
 
 SRC_URI_append_shr = " \
-  file://illume-disable-screensaver.patch \
   file://wizard-module-skipping.patch \
-  file://illume-flaunch-fix.patch \
 "
 
 EXTRA_OECONF = "\
@@ -69,14 +67,12 @@ RREPLACES_${PN} = "systray"
 
 PACKAGES =+ "\
   ${PN}-config-default \
-  ${PN}-config-illume \
   ${PN}-config-illume2 \
   ${PN}-config-minimalist \
   ${PN}-config-netbook \
   ${PN}-config-scaleable \
   ${PN}-config-standard \
   ${PN}-theme-default \
-  ${PN}-theme-illume \
   ${PN}-background-dark-gradient \
   ${PN}-background-light-gradient \
   ${PN}-images \
@@ -104,14 +100,12 @@ RRECOMMENDS_${PN} = "\
 "
 
 PACKAGE_ARCH_${PN}-config-default = "all"
-PACKAGE_ARCH_${PN}-config-illume = "all"
 PACKAGE_ARCH_${PN}-config-illume2 = "all"
 PACKAGE_ARCH_${PN}-config-minimalist = "all"
 PACKAGE_ARCH_${PN}-config-netbook = "all"
 PACKAGE_ARCH_${PN}-config-scaleable = "all"
 PACKAGE_ARCH_${PN}-config-standard = "all"
 PACKAGE_ARCH_${PN}-theme-default = "all"
-PACKAGE_ARCH_${PN}-theme-illume = "all"
 PACKAGE_ARCH_${PN}-background-dark-gradient = "all"
 PACKAGE_ARCH_${PN}-background-light-gradient = "all"
 PACKAGE_ARCH_${PN}-images = "all"
@@ -142,14 +136,12 @@ FILES_${PN} = "\
 "
 
 FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
-FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume"
-FILES_${PN}-config-illume2 = "${datadir}/enlightenment/data/config/illume-home"
+FILES_${PN}-config-illume2 = "${datadir}/enlightenment/data/config/illume"
 FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist"
 FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook"
 FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable"
 FILES_${PN}-config-standard = "${datadir}/enlightenment/data/config/standard"
 FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
-FILES_${PN}-theme-illume = "${datadir}/enlightenment/data/themes/illume.edj"
 FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
 FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj"
 FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj"
@@ -181,14 +173,7 @@ FILES_illume-keyboard-default-terminal = "\
 "
 
 RRECOMMENDS_${PN}-config-default = "${PN}-theme-default"
-RRECOMMENDS_${PN}-config-illume = "\
-  ${PN}-theme-illume \
-  illume-keyboard-default-alpha \
-  illume-keyboard-default-numeric \
-  illume-keyboard-default-terminal \
-"
 RRECOMMENDS_${PN}-config-illume2 = "\
-  ${PN}-theme-illume \
   illume-keyboard-default-alpha \
   illume-keyboard-default-numeric \
   illume-keyboard-default-terminal \
-- 
1.7.5.3

[meta-efl][PATCH 2/3] eve: update LICENSE fields and remove patch applied upstream

[Martin Jansa]

* 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>
---
 ...unconditional-ewk_view_context_menu_forwa.patch |   34 --------------------
 meta-efl/recipes-efl/e17/eve_svn.bb                |    7 ++--
 2 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/eve/0001-eve-remove-unconditional-ewk_view_context_menu_forwa.patch

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@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 \
-- 
1.7.5.3

[meta-efl][PATCH 3/3] webkit-efl: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d

[Martin Jansa]

* currently it doesn't build with default pkg-config from oe-core
  http://lists.linuxtogo.org/pipermail/openembedded-core/2011-June/003798.html
  if build pkg-config-native before this patch
  http://cgit.freedesktop.org/pkg-config/commit/?id=69a7eaa6763bb0920e2b539fffbad51348d94deb
  then webkit-efl builds fine again

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../webkit/webkit-efl/revert.r78057.patch          |   19 +++++++++
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |   42 ++++++++++++++++++++
 2 files changed, 61 insertions(+), 0 deletions(-)
 create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch
 create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb

diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch b/meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch
new file mode 100644
index 0000000..966a977
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch
@@ -0,0 +1,19 @@
+see https://bugs.webkit.org/show_bug.cgi?id=50762
+fixed by:
+http://trac.webkit.org/changeset/78047/trunk/Source/WebCore/CMakeLists.txt
+fix reverted by:
+http://trac.webkit.org/changeset/78057/trunk/Source/WebCore/CMakeLists.txt
+
+so revert revert as we care about webkit-efl and don't care about WinCE
+
+Index: Source/WebCore/CMakeLists.txt
+===================================================================
+--- Source/WebCore/CMakeLists.txt	(revision 78042)
++++ Source/WebCore/CMakeLists.txt	(revision 78047)
+@@ -1157,6 +1157,4 @@
+ 
+     platform/Arena.cpp
+-    platform/ContextMenu.cpp
+-    platform/ContextMenuItem.cpp
+     platform/ContentType.cpp
+     platform/CrossThreadCopier.cpp
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
new file mode 100644
index 0000000..ee1e18d
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Webkit browser engine, EFL edition"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \
+                    file://JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \
+                    file://WebKit/efl/ewk/EWebKit.h;endline=20;md5=55ea170b1582797d2c69712de850f2fa \
+"
+
+DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
+           libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
+           libxml2 pango eina ecore evas edje"
+
+SRCREV = "79192"
+PV = "1.3.11+svnr${SRCPV}"
+
+SRCREV_FORMAT = "source"
+
+SRC_URI = "\
+  svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;proto=http;subdir=src \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http;subdir=src \
+  file://revert.r78057.patch \
+ "
+
+S = "${WORKDIR}/src/Source"
+
+inherit cmake lib_package pkgconfig
+
+# Wants to jump too far for THUMB on armv4t
+# in WebCore::DocTypeStringsHash::doctype_hash_function(char const*, unsigned int)':
+# DocTypeStrings.cpp:(.text._ZN7WebCore18DocTypeStringsHash21doctype_hash_functionEPKcj[WebCore::DocTypeStringsHash::doctype_hash_function(char const*, unsigned int)]+0x12): relocation truncated to fit: R_ARM_THM_CALL against symbol `__gnu_thumb1_case_uhi' defined in .text section in x86_64-linux/usr/armv4t/lib/gcc/arm-oe-linux-gnueabi/4.5.2/libgcc.a(_thumb1_case_uhi.o)
+# the same in WebCore::CSSValueKeywordsHash::value_hash_function(char const*, unsigned int)':
+#             WebCore::CSSPropertyNamesHash::propery_hash_function(char const*, unsigned int)':
+#             WebCore::ColorDataHash::colordata_hash_function(char const*, unsigned int)':
+ARM_INSTRUCTION_SET = "ARM"
+
+EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=ON"
+
+LEAD_SONAME = "libewebkit.so"
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
+
+FILES_${PN} += "${datadir}/webkit-1.0/theme/default.edj ${datadir}/ewebkit-0/themes/default.edj"
+FILES_${PN}launcher = "${bindir}/EWebLauncher"
+FILES_${PN}launcher-dbg = "${bindir}/.debug/EWebLauncher"
-- 
1.7.5.3

Re: [meta-efl][PATCH 0/3] Pull request #7

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08-06-11 08:06, Martin Jansa wrote:
> Hi, please merge following patches.
> 
> The following changes since commit 92492f8596ae74044f0cbf1813c22ba6f18f742c:
> 
>   systemd-compat-units: disable old style 'networking' script for the time being (2011-06-06 13:08:15 +0200)
> 
> are available in the git repository at:
>   git://git.openembedded.org/meta-openembedded-contrib jansa/meta-efl
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-efl
> 
> Martin Jansa (3):
>   e-base,e-wm: bump EFL_SRCREV and remove illume1 from e-wm
>   eve: update LICENSE fields and remove patch applied upstream
>   webkit-efl: import from OE rev
>     d4f0211e2078d5033ae0dee74664de5520d8392d

Merged these as well. Let's get pkgconfig fixed in oe-core :)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFN7xejMkyGM64RGpERAvFkAJwNCJHVfc+FVhRb2nX1GXVppw89YwCfY40U
qqjhSdQrwpjNFisM5gTxCt0=
=7Gs8
-----END PGP SIGNATURE-----