summaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-08-16 12:18:24 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-17 12:56:21 +0100
commit196c1cc2f7b34fcd6ec32a52f655d68db4506c52 (patch)
treea67468b9a5293ae29dbe87bf30a0165f25388d3a /meta-efl
parent64b41ca4f3e4b6d475832088c45545fc54b15977 (diff)
downloadmeta-openembedded-196c1cc2f7b34fcd6ec32a52f655d68db4506c52.tar.gz
elbow: replace eve
* ewebkit1 was dropped in latest webkit-efl, elbow is based on ewebkit2 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/e17/elbow_git.bb24
-rw-r--r--meta-efl/recipes-efl/e17/eve/0001-eve-theme-updated-for-Openmoko-Freerunner-screen.patch102
-rw-r--r--meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch109
-rw-r--r--meta-efl/recipes-efl/e17/eve_git.bb34
4 files changed, 24 insertions, 245 deletions
diff --git a/meta-efl/recipes-efl/e17/elbow_git.bb b/meta-efl/recipes-efl/e17/elbow_git.bb
new file mode 100644
index 000000000..16664f97a
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/elbow_git.bb
@@ -0,0 +1,24 @@
1SUMMARY = "EFL based browser"
2LICENSE = "GPLv3"
3LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
4DEPENDS = "evas ecore edje eina elementary webkit-efl sqlite3"
5
6PV = "0.0.1+gitr${SRCPV}"
7SRCREV = "b41fd0bc9514ff61bb2a50d957efe4155fa3e6a8"
8
9# webkit-efl isn't available for < armv7a
10COMPATIBLE_MACHINE = "(-)"
11COMPATIBLE_MACHINE_i586 = "(.*)"
12COMPATIBLE_MACHINE_x86-64 = "(.*)"
13COMPATIBLE_MACHINE_armv7a = "(.*)"
14
15inherit e gettext cmake
16
17EXTRA_OECMAKE = "-DDATA_INSTALL_DIR=${datadir}"
18
19SRC_URI = " \
20 git://github.com/bunhere/elbow.git;protocol=https \
21"
22S = "${WORKDIR}/git"
23
24FILES_${PN} += "${datadir}/themes"
diff --git a/meta-efl/recipes-efl/e17/eve/0001-eve-theme-updated-for-Openmoko-Freerunner-screen.patch b/meta-efl/recipes-efl/e17/eve/0001-eve-theme-updated-for-Openmoko-Freerunner-screen.patch
deleted file mode 100644
index a3c5cdaaa..000000000
--- a/meta-efl/recipes-efl/e17/eve/0001-eve-theme-updated-for-Openmoko-Freerunner-screen.patch
+++ /dev/null
@@ -1,102 +0,0 @@
1From 203aabbb95a98fa455363f78ff07e2ed217b0086 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
3Date: Wed, 17 Nov 2010 16:38:47 +0100
4Subject: [PATCH 1/2] eve: theme updated for Openmoko Freerunner screen
5
6---
7 data/themes/default.edc | 24 +++++++++++-------------
8 1 file changed, 11 insertions(+), 13 deletions(-)
9
10diff --git a/data/themes/default.edc b/data/themes/default.edc
11index feeac4f..848ca5c 100644
12--- a/data/themes/default.edc
13+++ b/data/themes/default.edc
14@@ -1,8 +1,8 @@
15-#define TOP_PANEL_HEIGHT 64
16+#define TOP_PANEL_HEIGHT 80
17 #define BOTTOM_PANEL_HEIGHT 85
18 #define TOOLBAR_ITEMS 5
19 #define TOOLBAR_MIDDLE_ITEM 3
20-#define TOOLBAR_ITEM_SIZE 90
21+#define TOOLBAR_ITEM_SIZE 87
22 #define URLBAR_ITEM_SIZE 40
23
24 #define TOOLBAR_POSITION(_item_number) ((_item_number)*(TOOLBAR_ITEM_SIZE)-((TOOLBAR_ITEM_SIZE)*(TOOLBAR_MIDDLE_ITEM)))
25@@ -295,7 +295,6 @@ collections {
26 type: RECT;
27 description { state: "default" 0.0;
28 color: 0 0 0 255;
29- min: 240 320;
30 }
31 }
32 }
33@@ -526,7 +525,6 @@ collections {
34 type: RECT;
35 description { state: "default" 0.0;
36 color: 0 0 0 255;
37- min: 240 320;
38 }
39 }
40 part { name: "view";
41@@ -920,17 +918,17 @@ collections {
42 type: IMAGE;
43 description { state: "default" 0.0;
44 visible: 0;
45- min: 30 27;
46- max: 30 27;
47+ min: 80 78;
48+ max: 80 78;
49 fixed: 1 1;
50 image.normal: "panel-top-triangle.png";
51 rel1 {
52 relative: 1.0 0.0;
53- offset: 60 60;
54+ offset: 0 0;
55 }
56 rel2 {
57 relative: 1.0 0.0;
58- offset: 60 60;
59+ offset: 0 0;
60 }
61 }
62 description { state: "visible" 0.0;
63@@ -939,11 +937,11 @@ collections {
64 image.normal: "panel-top-triangle.png";
65 rel1 {
66 relative: 1.0 0.0;
67- offset: -15 13;
68+ offset: -40 38;
69 }
70 rel2 {
71 relative: 1.0 0.0;
72- offset: -15 13;
73+ offset: -40 38;
74 }
75 }
76 description { state: "pressed" 0.0;
77@@ -1033,11 +1031,11 @@ collections {
78 rel2 {
79 to_y: "panel-top";
80 relative: 1.0 0.0;
81- offset: -1 24;
82+ offset: -1 26;
83 }
84 text {
85 font: "Sans,Edje-Vera";
86- size: 8;
87+ size: 11;
88 text: "Untitled";
89 min: 0 1;
90 align: 0.5 0.5;
91@@ -1053,7 +1051,7 @@ collections {
92 rel1 {
93 to_y: "panel-top";
94 relative: 0.0 0.0;
95- offset: (URLBAR_ITEM_SIZE+20) 68;
96+ offset: (URLBAR_ITEM_SIZE+20) 70;
97 }
98 rel2 {
99 to_y: "panel-top";
100--
1011.9.1
102
diff --git a/meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch b/meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch
deleted file mode 100644
index 4b5e64ee5..000000000
--- a/meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch
+++ /dev/null
@@ -1,109 +0,0 @@
1From c1cb2a7b6d8b4661fde442ea4725df6842a94816 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 18 Apr 2014 11:52:18 +0200
4Subject: [PATCH 2/2] adapt to webkit-efl changes
5
6WIP: just fixes the build, probably doesn't render correctly
7
8https://trac.webkit.org/changeset/164168
9removed cairo.h from public headers and ewk_view_paint_contents
10
11https://trac.webkit.org/changeset/162581
12removed ewk_view_pre_render methods (with whole tiled support)
13
14https://git.enlightenment.org/core/elementary.git/commit/?id=0e465290be2016f12adcbc8c8d74645b3e6a1d9a
15ewk_view_tiled_smart_set is gone and ewk_view_single_smart_set is
16ewk_view_smart_set
17
18Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19---
20 src/bin/chrome.c | 4 +++-
21 src/bin/view.c | 22 +++++++---------------
22 2 files changed, 10 insertions(+), 16 deletions(-)
23
24diff --git a/src/bin/chrome.c b/src/bin/chrome.c
25index ee8f0c4..b46b29d 100644
26--- a/src/bin/chrome.c
27+++ b/src/bin/chrome.c
28@@ -5,6 +5,8 @@
29 #include <stdio.h>
30 #include <string.h>
31
32+#include <cairo.h>
33+
34 #include <Eina.h>
35 #include <Elementary.h>
36
37@@ -1997,7 +1999,7 @@ view_screenshot_add(Evas *evas, const Evas_Object *view)
38 if (cairo_status(cairo) != CAIRO_STATUS_SUCCESS)
39 goto error_cairo_create;
40
41- if (!ewk_view_paint_contents(priv, cairo, &rect))
42+ if (!ewk_view_screenshot_contents_get(priv, &rect, 1))
43 {
44 evas_object_del(img);
45 img = NULL;
46diff --git a/src/bin/view.c b/src/bin/view.c
47index 54de6c1..2b07511 100644
48--- a/src/bin/view.c
49+++ b/src/bin/view.c
50@@ -335,7 +335,7 @@ _view_load_finished(void *data, Evas_Object *view, void *event_info __UNUSED__)
51 h *= 2;
52
53 INF("load finished, pre-render %d,%d+%dx%d at %0.2f", x, y, w, h, zoom);
54- ewk_view_pre_render_region(view, x, y, w, h, zoom);
55+ //ewk_view_pre_render_region(view, x, y, w, h, zoom);
56 }
57
58 /* stop animators, we changed page */
59@@ -435,7 +435,7 @@ _view_pan_pre_render(View_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy)
60
61 INF("pre-render region %d,%d+%dx%d at %0.2f (viewport=%d,%d+%dx%d)",
62 px, py, pw, ph, zoom, x, y, w, h);
63- ewk_view_pre_render_region(sd->base.self, px, py, pw, ph, zoom);
64+ //ewk_view_pre_render_region(sd->base.self, px, py, pw, ph, zoom);
65 }
66
67 static unsigned int
68@@ -611,7 +611,7 @@ _view_pan_start(View_Smart_Data *sd, const Evas_Event_Mouse_Down *ev)
69
70 sd->pan.last_move = *p;
71
72- ewk_view_pre_render_cancel(sd->base.self);
73+ //ewk_view_pre_render_cancel(sd->base.self);
74
75 /* register function to collect samples and apply scrolls at fixed interval*/
76 if (!sd->animator.pan)
77@@ -816,7 +816,7 @@ _view_zoom_start(View_Smart_Data *sd, const Evas_Event_Mouse_Down *ev)
78 Evas_Coord cw, ch, vw, vh;
79 float z, zx, zy;
80
81- ewk_view_pre_render_cancel(sd->base.self);
82+ //ewk_view_pre_render_cancel(sd->base.self);
83
84 /* remember starting point so we have a reference */
85 sd->zoom.start.zoom = ewk_frame_page_zoom_get(frame);
86@@ -1512,17 +1512,9 @@ view_add(Evas_Object *parent, Backing_Store bs)
87 /* create ewk_view_single subclass, this is done only once! */
88 static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("EWK_View_Demo");
89
90- /* set current and parent apis to vanilla ewk_view_single methods */
91- if (bs == BACKING_STORE_TILED)
92- {
93- ewk_view_tiled_smart_set(&api);
94- ewk_view_tiled_smart_set(&_parent_sc);
95- }
96- else
97- {
98- ewk_view_single_smart_set(&api);
99- ewk_view_single_smart_set(&_parent_sc);
100- }
101+ /* set current and parent apis to vanilla ewk_view methods */
102+ ewk_view_smart_set(&api);
103+ ewk_view_smart_set(&_parent_sc);
104
105 /* override methods we want custom behavior */
106 api.sc.add = _view_smart_add;
107--
1081.9.1
109
diff --git a/meta-efl/recipes-efl/e17/eve_git.bb b/meta-efl/recipes-efl/e17/eve_git.bb
deleted file mode 100644
index 7879d6a8f..000000000
--- a/meta-efl/recipes-efl/e17/eve_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
1SUMMARY = "Enlightenment Web Browser"
2LICENSE = "LGPLv3"
3LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
4DEPENDS = "evas ecore edje elementary webkit-efl eldbus"
5
6PE = "1"
7PV = "0.3.0+gitr${SRCPV}"
8SRCREV = "7bd6549982f4fc5e26e5d11e6c536601358892e3"
9
10# webkit-efl isn't available for < armv7a
11COMPATIBLE_MACHINE = "(-)"
12COMPATIBLE_MACHINE_i586 = "(.*)"
13COMPATIBLE_MACHINE_x86-64 = "(.*)"
14COMPATIBLE_MACHINE_armv7a = "(.*)"
15
16inherit e gettext
17SRC_URI = " \
18 git://git.enlightenment.org/apps/${BPN}.git \
19 file://0001-eve-theme-updated-for-Openmoko-Freerunner-screen.patch \
20 file://0002-adapt-to-webkit-efl-changes.patch \
21"
22S = "${WORKDIR}/git"
23
24do_configure_prepend() {
25 autopoint || touch config.rpath
26}
27
28EXTRA_OECONF = "\
29 --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
30"
31
32FILES_${PN} += "\
33 ${datadir}/icons/eve.png \
34"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-30 16:55:45 +0000