summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-04-18 12:38:37 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-04-20 10:49:10 +0200
commitb1278bfe917da1ce0551d23ff0d3b41704b7405c (patch)
tree114612250098ef36d2bdb8e69d96632dc7113167 /meta-efl/recipes-efl
parent31e4ea131e692f49afa216ebc588ff9e9c449208 (diff)
downloadmeta-openembedded-b1278bfe917da1ce0551d23ff0d3b41704b7405c.tar.gz
eve: move to new git repo
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl')
-rw-r--r--meta-efl/recipes-efl/e17/eve/0001-eve-theme-updated-for-Openmoko-Freerunner-screen.patch (renamed from meta-efl/recipes-efl/e17/eve/eve-theme-for-smaller-screens.patch)26
-rw-r--r--meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch (renamed from meta-efl/recipes-efl/e17/eve/adapt-to-webkit-efl-changes.patch)45
-rw-r--r--meta-efl/recipes-efl/e17/eve_git.bb (renamed from meta-efl/recipes-efl/e17/eve_svn.bb)17
3 files changed, 52 insertions, 36 deletions
diff --git a/meta-efl/recipes-efl/e17/eve/eve-theme-for-smaller-screens.patch b/meta-efl/recipes-efl/e17/eve/0001-eve-theme-updated-for-Openmoko-Freerunner-screen.patch
index 61f3eca06..a3c5cdaaa 100644
--- a/meta-efl/recipes-efl/e17/eve/eve-theme-for-smaller-screens.patch
+++ b/meta-efl/recipes-efl/e17/eve/0001-eve-theme-updated-for-Openmoko-Freerunner-screen.patch
@@ -1,14 +1,14 @@
1From 2ce4e2e7cfe756bb78e883ff1a602a74e95288b5 Mon Sep 17 00:00:00 2001 1From 203aabbb95a98fa455363f78ff07e2ed217b0086 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Marco=20Trevisan=20(Trevi=C3=B1o)?= <mail@3v1n0.net> 2From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
3Date: Wed, 17 Nov 2010 16:38:47 +0100 3Date: Wed, 17 Nov 2010 16:38:47 +0100
4Subject: [PATCH] eve: theme updated for Openmoko Freerunner screen 4Subject: [PATCH 1/2] eve: theme updated for Openmoko Freerunner screen
5 5
6--- 6---
7 data/themes/default.edc | 22 +++++++++++----------- 7 data/themes/default.edc | 24 +++++++++++-------------
8 1 files changed, 11 insertions(+), 11 deletions(-) 8 1 file changed, 11 insertions(+), 13 deletions(-)
9 9
10diff --git a/data/themes/default.edc b/data/themes/default.edc 10diff --git a/data/themes/default.edc b/data/themes/default.edc
11index d4d29a6..7efaf23 100644 11index feeac4f..848ca5c 100644
12--- a/data/themes/default.edc 12--- a/data/themes/default.edc
13+++ b/data/themes/default.edc 13+++ b/data/themes/default.edc
14@@ -1,8 +1,8 @@ 14@@ -1,8 +1,8 @@
@@ -22,7 +22,7 @@ index d4d29a6..7efaf23 100644
22 #define URLBAR_ITEM_SIZE 40 22 #define URLBAR_ITEM_SIZE 40
23 23
24 #define TOOLBAR_POSITION(_item_number) ((_item_number)*(TOOLBAR_ITEM_SIZE)-((TOOLBAR_ITEM_SIZE)*(TOOLBAR_MIDDLE_ITEM))) 24 #define TOOLBAR_POSITION(_item_number) ((_item_number)*(TOOLBAR_ITEM_SIZE)-((TOOLBAR_ITEM_SIZE)*(TOOLBAR_MIDDLE_ITEM)))
25@@ -202,7 +202,6 @@ 25@@ -295,7 +295,6 @@ collections {
26 type: RECT; 26 type: RECT;
27 description { state: "default" 0.0; 27 description { state: "default" 0.0;
28 color: 0 0 0 255; 28 color: 0 0 0 255;
@@ -30,7 +30,7 @@ index d4d29a6..7efaf23 100644
30 } 30 }
31 } 31 }
32 } 32 }
33@@ -335,7 +334,6 @@ 33@@ -526,7 +525,6 @@ collections {
34 type: RECT; 34 type: RECT;
35 description { state: "default" 0.0; 35 description { state: "default" 0.0;
36 color: 0 0 0 255; 36 color: 0 0 0 255;
@@ -38,7 +38,7 @@ index d4d29a6..7efaf23 100644
38 } 38 }
39 } 39 }
40 part { name: "view"; 40 part { name: "view";
41@@ -893,17 +893,17 @@ collections { 41@@ -920,17 +918,17 @@ collections {
42 type: IMAGE; 42 type: IMAGE;
43 description { state: "default" 0.0; 43 description { state: "default" 0.0;
44 visible: 0; 44 visible: 0;
@@ -60,7 +60,7 @@ index d4d29a6..7efaf23 100644
60 } 60 }
61 } 61 }
62 description { state: "visible" 0.0; 62 description { state: "visible" 0.0;
63@@ -912,11 +912,11 @@ collections { 63@@ -939,11 +937,11 @@ collections {
64 image.normal: "panel-top-triangle.png"; 64 image.normal: "panel-top-triangle.png";
65 rel1 { 65 rel1 {
66 relative: 1.0 0.0; 66 relative: 1.0 0.0;
@@ -74,7 +74,7 @@ index d4d29a6..7efaf23 100644
74 } 74 }
75 } 75 }
76 description { state: "pressed" 0.0; 76 description { state: "pressed" 0.0;
77@@ -1006,11 +1006,11 @@ collections { 77@@ -1033,11 +1031,11 @@ collections {
78 rel2 { 78 rel2 {
79 to_y: "panel-top"; 79 to_y: "panel-top";
80 relative: 1.0 0.0; 80 relative: 1.0 0.0;
@@ -88,7 +88,7 @@ index d4d29a6..7efaf23 100644
88 text: "Untitled"; 88 text: "Untitled";
89 min: 0 1; 89 min: 0 1;
90 align: 0.5 0.5; 90 align: 0.5 0.5;
91@@ -1026,7 +1026,7 @@ collections { 91@@ -1053,7 +1051,7 @@ collections {
92 rel1 { 92 rel1 {
93 to_y: "panel-top"; 93 to_y: "panel-top";
94 relative: 0.0 0.0; 94 relative: 0.0 0.0;
@@ -98,5 +98,5 @@ index d4d29a6..7efaf23 100644
98 rel2 { 98 rel2 {
99 to_y: "panel-top"; 99 to_y: "panel-top";
100-- 100--
1011.7.1 1011.9.1
102 102
diff --git a/meta-efl/recipes-efl/e17/eve/adapt-to-webkit-efl-changes.patch b/meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch
index 5e03f8574..4b5e64ee5 100644
--- a/meta-efl/recipes-efl/e17/eve/adapt-to-webkit-efl-changes.patch
+++ b/meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch
@@ -1,3 +1,8 @@
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
1WIP: just fixes the build, probably doesn't render correctly 6WIP: just fixes the build, probably doesn't render correctly
2 7
3https://trac.webkit.org/changeset/164168 8https://trac.webkit.org/changeset/164168
@@ -7,12 +12,19 @@ https://trac.webkit.org/changeset/162581
7removed ewk_view_pre_render methods (with whole tiled support) 12removed ewk_view_pre_render methods (with whole tiled support)
8 13
9https://git.enlightenment.org/core/elementary.git/commit/?id=0e465290be2016f12adcbc8c8d74645b3e6a1d9a 14https://git.enlightenment.org/core/elementary.git/commit/?id=0e465290be2016f12adcbc8c8d74645b3e6a1d9a
10ewk_view_tiled_smart_set is gone and ewk_view_single_smart_set is ewk_view_smart_set 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(-)
11 23
12Index: src/bin/chrome.c 24diff --git a/src/bin/chrome.c b/src/bin/chrome.c
13=================================================================== 25index ee8f0c4..b46b29d 100644
14--- a/src/bin/chrome.c (revision 84579) 26--- a/src/bin/chrome.c
15+++ b/src/bin/chrome.c (working copy) 27+++ b/src/bin/chrome.c
16@@ -5,6 +5,8 @@ 28@@ -5,6 +5,8 @@
17 #include <stdio.h> 29 #include <stdio.h>
18 #include <string.h> 30 #include <string.h>
@@ -22,7 +34,7 @@ Index: src/bin/chrome.c
22 #include <Eina.h> 34 #include <Eina.h>
23 #include <Elementary.h> 35 #include <Elementary.h>
24 36
25@@ -1997,7 +1999,7 @@ 37@@ -1997,7 +1999,7 @@ view_screenshot_add(Evas *evas, const Evas_Object *view)
26 if (cairo_status(cairo) != CAIRO_STATUS_SUCCESS) 38 if (cairo_status(cairo) != CAIRO_STATUS_SUCCESS)
27 goto error_cairo_create; 39 goto error_cairo_create;
28 40
@@ -31,11 +43,11 @@ Index: src/bin/chrome.c
31 { 43 {
32 evas_object_del(img); 44 evas_object_del(img);
33 img = NULL; 45 img = NULL;
34Index: src/bin/view.c 46diff --git a/src/bin/view.c b/src/bin/view.c
35=================================================================== 47index 54de6c1..2b07511 100644
36--- a/src/bin/view.c (revision 84579) 48--- a/src/bin/view.c
37+++ b/src/bin/view.c (working copy) 49+++ b/src/bin/view.c
38@@ -335,7 +335,7 @@ 50@@ -335,7 +335,7 @@ _view_load_finished(void *data, Evas_Object *view, void *event_info __UNUSED__)
39 h *= 2; 51 h *= 2;
40 52
41 INF("load finished, pre-render %d,%d+%dx%d at %0.2f", x, y, w, h, zoom); 53 INF("load finished, pre-render %d,%d+%dx%d at %0.2f", x, y, w, h, zoom);
@@ -44,7 +56,7 @@ Index: src/bin/view.c
44 } 56 }
45 57
46 /* stop animators, we changed page */ 58 /* stop animators, we changed page */
47@@ -435,7 +435,7 @@ 59@@ -435,7 +435,7 @@ _view_pan_pre_render(View_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy)
48 60
49 INF("pre-render region %d,%d+%dx%d at %0.2f (viewport=%d,%d+%dx%d)", 61 INF("pre-render region %d,%d+%dx%d at %0.2f (viewport=%d,%d+%dx%d)",
50 px, py, pw, ph, zoom, x, y, w, h); 62 px, py, pw, ph, zoom, x, y, w, h);
@@ -53,7 +65,7 @@ Index: src/bin/view.c
53 } 65 }
54 66
55 static unsigned int 67 static unsigned int
56@@ -611,7 +611,7 @@ 68@@ -611,7 +611,7 @@ _view_pan_start(View_Smart_Data *sd, const Evas_Event_Mouse_Down *ev)
57 69
58 sd->pan.last_move = *p; 70 sd->pan.last_move = *p;
59 71
@@ -62,7 +74,7 @@ Index: src/bin/view.c
62 74
63 /* register function to collect samples and apply scrolls at fixed interval*/ 75 /* register function to collect samples and apply scrolls at fixed interval*/
64 if (!sd->animator.pan) 76 if (!sd->animator.pan)
65@@ -816,7 +816,7 @@ 77@@ -816,7 +816,7 @@ _view_zoom_start(View_Smart_Data *sd, const Evas_Event_Mouse_Down *ev)
66 Evas_Coord cw, ch, vw, vh; 78 Evas_Coord cw, ch, vw, vh;
67 float z, zx, zy; 79 float z, zx, zy;
68 80
@@ -71,7 +83,7 @@ Index: src/bin/view.c
71 83
72 /* remember starting point so we have a reference */ 84 /* remember starting point so we have a reference */
73 sd->zoom.start.zoom = ewk_frame_page_zoom_get(frame); 85 sd->zoom.start.zoom = ewk_frame_page_zoom_get(frame);
74@@ -1512,17 +1512,9 @@ 86@@ -1512,17 +1512,9 @@ view_add(Evas_Object *parent, Backing_Store bs)
75 /* create ewk_view_single subclass, this is done only once! */ 87 /* create ewk_view_single subclass, this is done only once! */
76 static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("EWK_View_Demo"); 88 static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("EWK_View_Demo");
77 89
@@ -92,3 +104,6 @@ Index: src/bin/view.c
92 104
93 /* override methods we want custom behavior */ 105 /* override methods we want custom behavior */
94 api.sc.add = _view_smart_add; 106 api.sc.add = _view_smart_add;
107--
1081.9.1
109
diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_git.bb
index 869f8bfdf..7879d6a8f 100644
--- a/meta-efl/recipes-efl/e17/eve_svn.bb
+++ b/meta-efl/recipes-efl/e17/eve_git.bb
@@ -2,8 +2,10 @@ SUMMARY = "Enlightenment Web Browser"
2LICENSE = "LGPLv3" 2LICENSE = "LGPLv3"
3LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" 3LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
4DEPENDS = "evas ecore edje elementary webkit-efl eldbus" 4DEPENDS = "evas ecore edje elementary webkit-efl eldbus"
5PV = "0.3.0.0+svnr${SRCPV}" 5
6SRCREV = "84579" 6PE = "1"
7PV = "0.3.0+gitr${SRCPV}"
8SRCREV = "7bd6549982f4fc5e26e5d11e6c536601358892e3"
7 9
8# webkit-efl isn't available for < armv7a 10# webkit-efl isn't available for < armv7a
9COMPATIBLE_MACHINE = "(-)" 11COMPATIBLE_MACHINE = "(-)"
@@ -12,18 +14,17 @@ COMPATIBLE_MACHINE_x86-64 = "(.*)"
12COMPATIBLE_MACHINE_armv7a = "(.*)" 14COMPATIBLE_MACHINE_armv7a = "(.*)"
13 15
14inherit e gettext 16inherit e gettext
15SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ 17SRC_URI = " \
16 file://adapt-to-webkit-efl-changes.patch \ 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 \
17" 21"
18S = "${WORKDIR}/${SRCNAME}" 22S = "${WORKDIR}/git"
19 23
20do_configure_prepend() { 24do_configure_prepend() {
21 autopoint || touch config.rpath 25 autopoint || touch config.rpath
22} 26}
23 27
24SRC_URI += "file://eve-theme-for-smaller-screens.patch \
25"
26
27EXTRA_OECONF = "\ 28EXTRA_OECONF = "\
28 --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ 29 --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
29" 30"