EFL upgrade and small sstate improvements

index a1ee671..9114832 100644
@@ -4,13 +4,11 @@ LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406
 SECTION = "console/network"
 SRCREV = "5394"
 PV = "0.0.0+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;proto=http"
 S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig"
 
-export CC := "${CC}"
-
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_install() {

index 7369df1..2fd7eac 100644
@@ -27,4 +27,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   pointercal-xinput \
   systemd-serialgetty \
   mplayer-common \
+  task-x11-server \
 "

index 17eddec..e53d5c0 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "67071"
+EFL_SRCREV ?= "67883"
 
 ARM_INSTRUCTION_SET = "arm"

index 23e7f3b..7836c8b 100644
@@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "evas ecore edje elementary webkit-efl"
 PV = "0.3.0.0+svnr${SRCPV}"
 PR = "r2"
-SRCREV = "67278"
-#SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV}"
 
 inherit e gettext
 SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"

new file mode 100644
index 0000000..a514bd2
@@ -0,0 +1,26 @@
+From ced1e0e6e0e7b80ad4e9b9766e0a132dc97d6bb6 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Tue, 14 Feb 2012 20:54:31 +0100
+Subject: [PATCH 1/8] depend on eina not eina-0
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c0a5697..0b67de8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,7 @@ AC_HEADER_STDC
+ 
+ AM_PROG_LIBTOOL
+ 
+-PKG_CHECK_MODULES(TASKS, [elementary eina-0 dbus-1 sqlite3])
++PKG_CHECK_MODULES(TASKS, [elementary eina dbus-1 sqlite3])
+ 
+ AC_OUTPUT([
+ Makefile
+-- 
+1.7.8.4
+

similarity index 41%
rename from meta-efl/recipes-efl/e17/e-tasks/genlist_item_insert_before.api.patch
rename to meta-efl/recipes-efl/e17/e-tasks/0002-adapt-to-elementary-genlist_item_insert_before-API-c.patch
index 72ccc19..fbc5851 100644
@@ -1,9 +1,19 @@
-adapt to elementary genlist_item_insert_before API change from r55869
+From 80893c65d5ea68f18e26169323a62eeac14ae177 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Tue, 14 Feb 2012 20:53:48 +0100
+Subject: [PATCH 2/8] adapt to elementary genlist_item_insert_before API
+ change from r55869
 
-diff -uNr trunk2/src/gui.c trunk/src/gui.c
---- trunk2/src/gui.c	2010-02-01 07:56:03.000000000 +0100
-+++ trunk/src/gui.c	2011-01-30 00:36:15.000000000 +0100
-@@ -1067,7 +1067,7 @@
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ src/gui.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/gui.c b/src/gui.c
+index 113c807..f58dcd6 100644
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -1067,7 +1067,7 @@ void create_new_task(void *data, Evas_Object *obj, void *event_info)
  	if(strcmp(sel_category, " All Tasks ")==0) strcpy(Task[i].cat, "Personal");
  	else strcpy(Task[i].cat, sel_category);
  	if(item) { 

@@ -12,3 +22,6 @@ diff -uNr trunk2/src/gui.c trunk/src/gui.c
  								  NULL, NULL);
  	}
  	//cater for no items in list
+-- 
+1.7.8.4
+

similarity index 99%
rename from meta-efl/recipes-efl/e17/e-tasks/0001-adapt-to-newer-elm-API.patch
rename to meta-efl/recipes-efl/e17/e-tasks/0003-adapt-to-newer-elm-API.patch
index 70fa169..cf5469e 100644
@@ -1,7 +1,7 @@
-From 1204c115e006b380c2c64452c9d35f0d695502fe Mon Sep 17 00:00:00 2001
+From 377c4266e9356239c43ac5711a06831ee74f9eef Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Tue, 6 Dec 2011 19:07:56 +0100
-Subject: [PATCH] adapt to newer elm API
+Subject: [PATCH 3/8] adapt to newer elm API
 
 * sed 's/elm_button_label_set/elm_object_text_set/g' -i src/gui.c
   sed 's/elm_button_label_set/elm_object_text_set/g' -i src/db_sqlite.c

@@ -76,7 +76,7 @@ index dfee471..fde2181 100644
  			tystr = strdup(cate);
  			evas_object_smart_callback_add(bt, "clicked", set_category, (char *)tystr);
 diff --git a/src/gui.c b/src/gui.c
-index 113c807..5c8003c 100644
+index f58dcd6..f6f1c6c 100644
 --- a/src/gui.c
 +++ b/src/gui.c
 @@ -51,11 +51,11 @@ void select_category(void *data, Evas_Object *obj, void *event_info)

@@ -652,5 +652,5 @@ index 113c807..5c8003c 100644
  	evas_object_size_hint_align_set(done_button, -1.0, -1.0);
  	elm_box_pack_end(hbox, done_button);
 -- 
-1.7.8
+1.7.8.4
 

similarity index 88%
rename from meta-efl/recipes-efl/e17/e-tasks/0001-fix-changed-callback-name.patch
rename to meta-efl/recipes-efl/e17/e-tasks/0004-fix-changed-callback-name.patch
index cf51deb..c4d5ac7 100644
@@ -1,7 +1,7 @@
-From d6d24a1776594e71ee66db78cc234f38f97f6825 Mon Sep 17 00:00:00 2001
+From 4ca9e2aac3e9f1a981b48552c3aff255863cd1fe Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 17 Dec 2011 03:12:29 +0100
-Subject: [PATCH] fix changed callback name
+Subject: [PATCH 4/8] fix changed callback name
 
 Signed-off-by: Martin Jansa <[email protected]>
 ---

@@ -10,7 +10,7 @@ Signed-off-by: Martin Jansa <[email protected]>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui.c b/src/gui.c
-index 5c8003c..b032ee5 100644
+index f6f1c6c..69b06d8 100644
 --- a/src/gui.c
 +++ b/src/gui.c
 @@ -1230,7 +1230,7 @@ void edit_cat(void)

@@ -36,5 +36,5 @@ index 12072f5..116b84c 100644
  	//open database 
  	open_database();
 -- 
-1.7.8
+1.7.8.4
 

182 lines not on this page · raw message

296 lines not on this page · raw message

new file mode 100644
index 0000000..409a464
@@ -0,0 +1,35 @@
+From 8f5979f9c289b4c9313dd93a113ed164d3acb5a2 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Tue, 14 Feb 2012 21:08:39 +0100
+Subject: [PATCH 7/8] db_sqlite: fix warning
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ src/db_sqlite.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/db_sqlite.c b/src/db_sqlite.c
+index 3eb7790..326063e 100644
+--- a/src/db_sqlite.c
++++ b/src/db_sqlite.c
+@@ -19,7 +19,7 @@
+ 
+ void open_database(void)
+ {
+-	int db_ret, ret;
++	int db_ret;
+ 	char db[255];
+ 	
+ 	sprintf(db, "%s/.tasks/tasks.db", home_dir);
+@@ -28,7 +28,7 @@ void open_database(void)
+ 		printf("SQL error: %s\n", sqlite3_errmsg(tasks));
+ 		printf("Creating new db file\n");
+ 		//exit(1);
+-		ret = system("mkdir ~/.tasks");
++		system("mkdir ~/.tasks");
+ 		sqlite3_close(tasks);
+ 		db_ret = sqlite3_open(db, &tasks);
+ 	}
+-- 
+1.7.8.4
+

79 lines not on this page · raw message

deleted file mode 100644
index 6e1981e..0000000
@@ -1,12 +0,0 @@
-diff -uNr trunk.orig//configure.ac trunk/configure.ac
---- trunk.orig//configure.ac	2009-12-18 12:59:52.000000000 +0100
-+++ trunk/configure.ac	2010-08-22 23:22:52.000000000 +0200
-@@ -15,7 +15,7 @@
- 
- AM_PROG_LIBTOOL
- 
--PKG_CHECK_MODULES(TASKS, [elementary eina-0 dbus-1 sqlite3])
-+PKG_CHECK_MODULES(TASKS, [elementary eina dbus-1 sqlite3])
- 
- AC_OUTPUT([
- Makefile

index f4a25f8..614b213 100644
@@ -10,13 +10,18 @@ inherit autotools
 
 SRCREV = "25"
 PV = "0.0.1+svnr${SRCPV}"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http \
-           file://genlist_item_insert_before.api.patch \
-           file://0001-adapt-to-newer-elm-API.patch \
-           file://depends.eina.patch \
-           file://0001-fix-changed-callback-name.patch"
+  file://0001-depend-on-eina-not-eina-0.patch \
+  file://0002-adapt-to-elementary-genlist_item_insert_before-API-c.patch \
+  file://0003-adapt-to-newer-elm-API.patch \
+  file://0004-fix-changed-callback-name.patch \
+  file://0005-adapt-to-even-newer-elm-API.patch \
+  file://0006-remove-deprecated-API.patch \
+  file://0007-db_sqlite-fix-warning.patch \
+  file://0008-fix-warning-about-incompatible-pointer-types.patch \
+"
 S = "${WORKDIR}/trunk"
 
 do_install_append() {

new file mode 100644
index 0000000..c4a18d0
@@ -0,0 +1,135 @@
+From c7f54838d09cc94dd23ed060889bae780758c391 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Sun, 19 Feb 2012 23:09:07 +0100
+Subject: [PATCH] Revert "Illume: Remove the popup. It's not needed now."
+
+This reverts commit cba0bc9833689900930272fa5c4a2cd2529d3028.
+---
+ src/modules/illume-indicator/e_mod_ind_win.c |   23 ++++++++++++++++++++---
+ src/modules/illume-indicator/e_mod_ind_win.h |    1 +
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/illume-indicator/e_mod_ind_win.c b/src/modules/illume-indicator/e_mod_ind_win.c
+index d3657d6..4a593fd 100644
+--- a/src/modules/illume-indicator/e_mod_ind_win.c
++++ b/src/modules/illume-indicator/e_mod_ind_win.c
+@@ -57,6 +57,11 @@ e_mod_ind_win_new(E_Zone *zone)
+    /* set this window to not accept or take focus */
+    ecore_x_icccm_hints_set(iwin->win->evas_win, 0, 0, 0, 0, 0, 0, 0);
+ 
++   /* create the popup */
++   iwin->popup = e_popup_new(zone, 0, 0, zone->w, h);
++   e_popup_name_set(iwin->popup, "indicator");
++   e_popup_layer_set(iwin->popup, 200);
++
+    /* create our event rectangle */
+    iwin->o_event = evas_object_rectangle_add(iwin->win->evas);
+    evas_object_color_set(iwin->o_event, 0, 0, 0, 0);
+@@ -85,6 +90,8 @@ e_mod_ind_win_new(E_Zone *zone)
+    evas_object_move(iwin->o_base, 0, 0);
+    evas_object_show(iwin->o_base);
+ 
++   e_popup_edje_bg_object_set(iwin->popup, iwin->o_base);
++
+    /* create our gadget container */
+    iwin->gadcon = e_gadcon_swallowed_new("illume-indicator", zone->id, 
+                                          iwin->o_base, "e.swallow.content");
+@@ -133,12 +140,15 @@ e_mod_ind_win_new(E_Zone *zone)
+ 
+    /* set minimum size of this window & popup */
+    e_win_size_min_set(iwin->win, zone->w, h);
++   ecore_evas_size_min_set(iwin->popup->ecore_evas, zone->w, h);
+ 
+    /* position and resize this window */
+    e_win_move_resize(iwin->win, zone->x, zone->y, zone->w, h);
++   e_popup_move_resize(iwin->popup, zone->x, zone->y, zone->w, h);
+ 
+    /* show the window */
+    e_win_show(iwin->win);
++   e_popup_show(iwin->popup);
+ 
+    /* set this window on proper zone */
+    e_border_zone_set(iwin->win->border, zone);
+@@ -188,6 +198,9 @@ _e_mod_ind_win_cb_free(Ind_Win *iwin)
+    /* tell conformant apps our position and size */
+    ecore_x_e_illume_indicator_geometry_set(iwin->zone->black_win, 0, 0, 0, 0);
+ 
++   if (iwin->popup) e_object_del(E_OBJECT(iwin->popup));
++   iwin->popup = NULL;
++
+    /* delete the window */
+    if (iwin->win) e_object_del(E_OBJECT(iwin->win));
+    iwin->win = NULL;
+@@ -214,6 +227,7 @@ _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event)
+ 
+    /* set minimum size of this window */
+    e_win_size_min_set(iwin->win, iwin->zone->w, h);
++   ecore_evas_size_min_set(iwin->popup->ecore_evas, iwin->zone->w, h);
+ 
+    /* NB: Not sure why, but we need to tell this border to fetch icccm 
+     * size position hints now :( (NOTE: This was not needed a few days ago) 
+@@ -222,6 +236,7 @@ _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event)
+ 
+    /* resize this window */
+    e_win_resize(iwin->win, iwin->zone->w, h);
++   e_popup_resize(iwin->popup, iwin->zone->w, h);
+ 
+    /* tell conformant apps our position and size */
+    ecore_x_e_illume_indicator_geometry_set(iwin->zone->black_win, 
+@@ -246,6 +261,7 @@ _e_mod_ind_win_cb_zone_resize(void *data, int type __UNUSED__, void *event)
+ 
+    /* set minimum size of this window to match zone size */
+    e_win_size_min_set(iwin->win, ev->zone->w, h);
++   ecore_evas_size_min_set(iwin->popup->ecore_evas, ev->zone->w, h);
+ 
+    return ECORE_CALLBACK_PASS_ON;
+ }
+@@ -256,6 +272,7 @@ _e_mod_ind_win_cb_resize(E_Win *win)
+    Ind_Win *iwin;
+ 
+    if (!(iwin = win->data)) return;
++   if (iwin->popup) e_popup_resize(iwin->popup, win->w, win->h);
+    if (iwin->o_event) evas_object_resize(iwin->o_event, win->w, win->h);
+    if (iwin->o_base) evas_object_resize(iwin->o_base, win->w, win->h);
+    if (iwin->gadcon->o_container)
+@@ -427,7 +444,7 @@ _e_mod_ind_win_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj
+              bd->y = ny;
+              bd->changes.pos = 1;
+              bd->changed = 1;
+-             e_win_move(iwin->win, iwin->win->x, ny);
++             e_popup_move(iwin->popup, iwin->popup->x, ny);
+           }
+      }
+ }
+@@ -553,7 +570,7 @@ _e_mod_ind_win_cb_border_hide(void *data, int type __UNUSED__, void *event)
+    if (!(iwin = data)) return ECORE_CALLBACK_PASS_ON;
+    ev = event;
+    if (ev->border != iwin->win->border) return ECORE_CALLBACK_PASS_ON;
+-   e_win_hide(iwin->win);
++   e_popup_hide(iwin->popup);
+    return ECORE_CALLBACK_PASS_ON;
+ }
+ 
+@@ -566,6 +583,6 @@ _e_mod_ind_win_cb_border_show(void *data, int type __UNUSED__, void *event)
+    if (!(iwin = data)) return ECORE_CALLBACK_PASS_ON;
+    ev = event;
+    if (ev->border != iwin->win->border) return ECORE_CALLBACK_PASS_ON;
+-   e_win_show(iwin->win);
++   e_popup_show(iwin->popup);
+    return ECORE_CALLBACK_PASS_ON;
+ }
+diff --git a/src/modules/illume-indicator/e_mod_ind_win.h b/src/modules/illume-indicator/e_mod_ind_win.h
+index aa2dd1c..d41a861 100644
+--- a/src/modules/illume-indicator/e_mod_ind_win.h
++++ b/src/modules/illume-indicator/e_mod_ind_win.h
+@@ -14,6 +14,7 @@ struct _Ind_Win
+    Eina_List *hdls;
+ 
+    E_Win *win;
++   E_Popup *popup;
+    Evas_Object *o_base, *o_event;
+    E_Gadcon *gadcon;
+    E_Menu *menu;
+-- 
+1.7.8.4
+

index e931967..25aa865 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r23"
+PR = "r24"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext

@@ -12,6 +12,7 @@ S = "${WORKDIR}/${SRCNAME}"
 
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};proto=http \
+  file://0001-Revert-Illume-Remove-the-popup.-It-s-not-needed-now.patch \
   file://enlightenment_start.oe \
   file://applications.menu \
 "