Pull request #7

index 26639f6..e87a96b 100644
@@ -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"
 

deleted file mode 100644
index 984895c..0000000
@@ -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;

deleted file mode 100644
index 5aab3b5..0000000
@@ -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;

index baed233..b32634d 100644
@@ -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 \

deleted file mode 100644
index bb86e98..0000000
@@ -1,34 +0,0 @@
-From cff40dddea01d217fc3789c2c8e3337ea2ec34b7 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-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
-

index d324c55..2cec0fd 100644
@@ -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 \

new file mode 100644
index 0000000..966a977
@@ -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

42 lines not on this page · raw message