efl: fix SRC_URI for m4 dirs, fix ewl compilation

6 files changed, 33 insertions, 160 deletions

diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index 3e7b5299ea..cea3114dc7 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -12,7 +12,7 @@ inherit efl
 SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
            file://configure.patch;patch=1 \
            file://fix-tslib-configure.patch;patch=1 \
-           cvs://anonymous@thinktux.net/root;module=e17/libs/ecore/m4;date=20060101"
+           ${E_CVS};module=e17/libs/ecore/m4;date=20060101"
 
 S = "${WORKDIR}/ecore-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc
index b1b82d5ed1..9b8114de53 100644
--- a/packages/efl/esmart.inc
+++ b/packages/efl/esmart.inc
@@ -6,7 +6,7 @@ PROVIDES += "virtual/esmart"
 inherit efl
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/esmart-${PV}.tar.gz \
-           cvs://anonymous@thinktux.net/root;module=e17/libs/esmart/m4;date=20060101"
+           ${E_CVS};module=e17/libs/esmart/m4;date=20060101"
 
 do_configure_prepend() {
 	install -d "${S}/m4"
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 07574daa38..e93803982e 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -13,7 +13,7 @@ export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
            file://fix-configure-${PV}.patch;patch=1 \
-           cvs://anonymous@thinktux.net/root;module=e17/libs/evas/m4;date=20060101"
+           ${E_CVS};module=e17/libs/evas/m4;date=20060101"
 
 S = "${WORKDIR}/evas-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
diff --git a/packages/efl/ewl/ecore-flags.patch b/packages/efl/ewl/ecore-flags.patch
deleted file mode 100644
index 9c4f5afc78..0000000000
--- a/packages/efl/ewl/ecore-flags.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Nur ewl-0.0.4.004~/src/lib/ewl_config.c ewl-0.0.4.004/src/lib/ewl_config.c
---- ewl-0.0.4.004~/src/lib/ewl_config.c	2005-09-29 18:02:24.000000000 -0700
-+++ ewl-0.0.4.004/src/lib/ewl_config.c	2005-09-29 18:03:10.000000000 -0700
-@@ -210,8 +210,8 @@
- 
- 		cc = ewl_config_int_get("/ewl/theme/color_classes/count");
- 		prop = ecore_config_get("/ewl/theme/color_classes/count");
--		prop->flags &= ~PF_MODIFIED;
--		prop->flags |= PF_SYSTEM;
-+		prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+		prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 		for (i = 0; i < cc; i++) {
- 			char *name;
-@@ -221,8 +221,8 @@
- 					"/ewl/theme/color_classes/%d/name", i);
- 			name = ewl_config_str_get(key);
- 			prop = ecore_config_get(key);
--			prop->flags &= ~PF_MODIFIED;
--			prop->flags |= PF_SYSTEM;
-+			prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+			prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 			if (name) {
- 				int r, g, b, a;
-@@ -233,85 +233,85 @@
- 						"/ewl/theme/color_classes/%d/r", i);
- 				r = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/g", i);
- 				g = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/b", i);
- 				b = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/a", i);
- 				a = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/r2", i);
- 				r2 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/g2", i);
- 				g2 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/b2", i);
- 				b2 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/a2", i);
- 				a2 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/r3", i);
- 				r3 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/g3", i);
- 				g3 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/b3", i);
- 				b3 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/a3", i);
- 				a3 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				edje_color_class_set(name, r, g, b, a,
- 						r2, g2, b2, a2,
-@@ -389,8 +389,8 @@
- 
- 		for(i = 0; keys[i] != NULL; i++) {
- 			prop = ecore_config_get(keys[i]);
--			prop->flags &= ~PF_MODIFIED;
--			prop->flags |= PF_SYSTEM;
-+			prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+			prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 		}
- 
- 		ecore_config_listen("ewl_debug_enable", "/ewl/debug/enable",
diff --git a/packages/efl/ewl/fix-ecore.patch b/packages/efl/ewl/fix-ecore.patch
deleted file mode 100644
index 7a514a1740..0000000000
--- a/packages/efl/ewl/fix-ecore.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur ewl-0.0.4.004~/src/lib/Ewl.h ewl-0.0.4.004/src/lib/Ewl.h
---- ewl-0.0.4.004~/src/lib/Ewl.h.in	2005-09-29 17:44:59.000000000 -0700
-+++ ewl-0.0.4.004/src/lib/Ewl.h.in	2005-09-29 17:46:57.000000000 -0700
-@@ -257,6 +257,7 @@
- #include <Evas.h>
- #include <Edje.h>
- #include <Ecore.h>
-+#include <Ecore_Data.h>
- #include <Edb.h>
- 
- #include <stdio.h>
diff --git a/packages/efl/ewl_0.0.4.007.bb b/packages/efl/ewl_0.0.4.007.bb
new file mode 100644
index 0000000000..e89b668b93
--- /dev/null
+++ b/packages/efl/ewl_0.0.4.007.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "The Enlightened Widget Library, \
+a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
+# as of recent CVS HEAD, ewl no longer needs etox and no longer needs edb
+DEPENDS = "edb virtual/evas virtual/ecore edje"
+# emotion
+RDEPENDS += "ewl-themes"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit efl
+
+SRC_URI += "file://ewl-configure.patch;patch=1 \
+            file://no-examples.patch;patch=1 \
+            file://minmax.patch;patch=1 \
+            ${E_CVS};module=e17/libs/evas/m4;date=20060501"
+
+do_configure_prepend() {
+	if [ -e "${WORKDIR}/m4" ]; then
+		install -d "${S}/m4"
+		install "${WORKDIR}/m4/"*.m4 "${S}/m4"
+		aclocal -I m4
+	fi
+}
+
+do_stage_append() {
+	for i in src/lib/ewl_*.h
+	do
+		install -m 0644 $i ${STAGING_INCDIR}
+	done
+}