Midori and enlightenment upgrades

deleted file mode 100755
index b74a2d809a1bca11ec8548cb9dfcd7501c5f346d..0000000000000000000000000000000000000000
GIT binary patch

deleted file mode 100644
index 195bcb3..0000000
@@ -1,13 +0,0 @@
-require midori.inc
-
-PR = "r2"
-
-SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
-           file://waf \
-          "
-SRC_URI[midori.md5sum] = "900037557b82818d79d2dd1c5a7d7fd2"
-SRC_URI[midori.sha256sum] = "fca4a0eab03358f20d7700069dbf2faaf8fa5c11aaad97f4208aea608f4bed9f"
-
-do_configure_prepend() {
-  cp -f ${WORKDIR}/waf ${S}/
-}

new file mode 100644
index 0000000..827eb19
@@ -0,0 +1,8 @@
+require midori.inc
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
+          "
+SRC_URI[midori.md5sum] = "a6578ebfd237c0f22cce49113b95f70c"
+SRC_URI[midori.sha256sum] = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2"

index 32f706f..171e617 100644
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10a051c72424b80bc784a3903651b43b"
 DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb poppler"
 PV = "0.8.0+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl gettext

@@ -32,6 +32,11 @@ RSUGGESTS_${PN} = "${PN}-tests ${PN}-accessibility"
 
 FILES_${PN} += "\
   ${libdir}/edje/modules/elm \
+  ${libdir}/elementary/modules/datetime_input_ctxpopup/*/module.so \
+"
+
+FILES_${PN}-dev += "\
+  ${libdir}/elementary/modules/datetime_input_ctxpopup/*/module.la \
 "
 
 FILES_${PN}-themes = "\

@@ -46,6 +51,7 @@ FILES_${PN}-dbg += "\
   ${libdir}/elementary/modules/test_entry/*/.debug \
   ${libdir}/elementary/modules/test_map/*/.debug \
   ${libdir}/elementary/modules/access_output/*/.debug \
+  ${libdir}/elementary/modules/datetime_input_ctxpopup/*/.debug \
   ${libdir}/edje/modules/elm/*/.debug \
 "
 

deleted file mode 100644
index a514bd2..0000000
@@ -1,26 +0,0 @@
-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
-

deleted file mode 100644
index fbc5851..0000000
@@ -1,27 +0,0 @@
-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
-
-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) { 
--		task_list[i] = elm_genlist_item_insert_after(list, &itc1, &Task[i], item, ELM_GENLIST_ITEM_NONE,
-+		task_list[i] = elm_genlist_item_insert_after(list, &itc1, &Task[i], NULL, item, ELM_GENLIST_ITEM_NONE,
- 								  NULL, NULL);
- 	}
- 	//cater for no items in list
--- 
-1.7.8.4
-

656 lines not on this page · raw message

deleted file mode 100644
index c4d5ac7..0000000
@@ -1,40 +0,0 @@
-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 4/8] fix changed callback name
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- src/gui.c  |    2 +-
- src/main.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui.c b/src/gui.c
-index f6f1c6c..69b06d8 100644
---- a/src/gui.c
-+++ b/src/gui.c
-@@ -1230,7 +1230,7 @@ void edit_cat(void)
- 
- 	cat_win = elm_win_add(NULL, "cat", ELM_WIN_BASIC);
- 	elm_win_title_set(cat_win, "Edit Categories");
--	evas_object_smart_callback_add(cat_win, "delete-request", cat_win_del, cat_win);
-+	evas_object_smart_callback_add(cat_win, "delete,request", cat_win_del, cat_win);
- 	
- 	//add background
- 	bg = elm_bg_add(cat_win);
-diff --git a/src/main.c b/src/main.c
-index 12072f5..116b84c 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -64,7 +64,7 @@ elm_main(int argc, char **argv)
- 	//set up win
- 	win = elm_win_add(NULL, "tasks", ELM_WIN_BASIC);
- 	elm_win_title_set(win, "Tasks");
--	evas_object_smart_callback_add(win, "delete-request", my_win_del, NULL);
-+	evas_object_smart_callback_add(win, "delete,request", my_win_del, NULL);
- 
- 	//open database 
- 	open_database();
--- 
-1.7.8.4
-

182 lines not on this page · raw message

296 lines not on this page · raw message

deleted file mode 100644
index 409a464..0000000
@@ -1,35 +0,0 @@
-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

similarity index 62%
rename from meta-efl/recipes-efl/e17/e-tasks_svn.bb
rename to meta-efl/recipes-efl/e17/e-tasks_git.bb
index 614b213..5196f42 100644
@@ -8,21 +8,12 @@ DEPENDS = "elementary eina edbus sqlite3"
 
 inherit autotools
 
-SRCREV = "25"
-PV = "0.0.1+svnr${SRCPV}"
-PR = "r12"
+SRCREV = "b640f0e7287877983645d9d9a36f85a0b6a54631"
+PV = "0.0.2+gitr${SRCPV}"
 
-SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http \
-  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 \
+SRC_URI = "git://github.com/shr-project/e-tasks.git;protocol=git;branch=master \
 "
-S = "${WORKDIR}/trunk"
+S = "${WORKDIR}/git"
 
 do_install_append() {
         install -d "${D}/${datadir}/pixmaps"

index c512530..c3ecf58 100644
@@ -13,3 +13,7 @@ AUTO_LIBNAME_PKGS = ""
 RREPLACES_${PN} = "libeina-ver-pre-svn-00-0 libeina-ver-pre-svn-01-0"
 
 FILES_${PN} += "${libdir}/eina"
+
+do_install_append() {
+  rmdir ${D}${bindir}
+}

index b337530..58636ec 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "68387"
+EFL_SRCREV ?= "69323"
 
 ARM_INSTRUCTION_SET = "arm"