efl, e17: update to latest versions

20 files changed, 38 insertions, 47 deletions

diff --git a/packages/e17/e-wm_0.16.999.032.bb b/packages/e17/e-wm_0.16.999.036.bb
index 78c1c1aa26..78c1c1aa26 100644
--- a/packages/e17/e-wm_0.16.999.032.bb
+++ b/packages/e17/e-wm_0.16.999.036.bb
diff --git a/packages/e17/e17genmenu_2.0.2.bb b/packages/e17/e17genmenu_2.0.2.bb
deleted file mode 100644
index 49b139a213..0000000000
--- a/packages/e17/e17genmenu_2.0.2.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Convert Gnome or KDE menus to e17 menus"
-DEPENDS = "e virtual/ecore virtual/evas eet engrave"
-LICENSE = "GPL"
-HOMEPAGE = "http://sourceforge.net/projects/e17genmenu"
-PR = "r0"
-
-inherit e
-
-SECTION = "e/utils"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/e17genmenu/e17genmenu-2.0.2.tar.gz"
-
-do_configure_prepend() {
-	find -type f | xargs sed -i 's:share/icons/%s/48x48/apps:share/pixmaps:'
-	find -type f | xargs sed -i 's:share/icons/hicolor/48x48/apps:share/pixmaps:'
-	find -type f | xargs sed -i 's:%s/share/pixmaps", GNOME_PREFIX, theme:%s/share/pixmaps", GNOME_PREFIX:'
-}
diff --git a/packages/e17/e17genmenu_4.2.0.bb b/packages/e17/e17genmenu_4.2.0.bb
new file mode 100644
index 0000000000..baf399864d
--- /dev/null
+++ b/packages/e17/e17genmenu_4.2.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Convert Gnome or KDE menus to e17 menus"
+DEPENDS = "virtual/ecore virtual/evas eet engrave"
+LICENSE = "GPL"
+HOMEPAGE = "http://sourceforge.net/projects/e17genmenu"
+PR = "r0"
+
+inherit e
+
+SECTION = "e/utils"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e17genmenu/e17genmenu-${PV}.tar.gz"
+S = "${WORKDIR}/${PN}"
+
+PACKAGES += "${PN}-doc"
+
+FILES_${PN} = "${bindir} ${datadir}"
+FILES_${PN}-doc = "/usr/doc"
\ No newline at end of file
diff --git a/packages/efl/ecore-fb_0.9.9.032.bb b/packages/efl/ecore-fb_0.9.9.036.bb
index 8eb0017d26..49c32927af 100644
--- a/packages/efl/ecore-fb_0.9.9.032.bb
+++ b/packages/efl/ecore-fb_0.9.9.036.bb
@@ -20,8 +20,10 @@ EXTRA_OECONF = "--enable-ecore-fb \
 		--disable-curl \
 		--without-curl-config \
 		--enable-ecore-config \
+        --enable-ecore-desktop \
 		--disable-openssl"
 
 parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \
 	 Ecore_Txt Ecore_Fb Ecore_Con \
-	 Ecore_Ipc Ecore_Evas Ecore_Config"
+	 Ecore_Ipc Ecore_Evas Ecore_Config \
+     Ecore_Desktop"
diff --git a/packages/efl/ecore-native_0.9.9.032.bb b/packages/efl/ecore-native_0.9.9.036.bb
index 7d7ed2370a..7d7ed2370a 100644
--- a/packages/efl/ecore-native_0.9.9.032.bb
+++ b/packages/efl/ecore-native_0.9.9.036.bb
diff --git a/packages/efl/ecore-x11_0.9.9.032.bb b/packages/efl/ecore-x11_0.9.9.036.bb
index 78d0a66b38..1deb641326 100644
--- a/packages/efl/ecore-x11_0.9.9.032.bb
+++ b/packages/efl/ecore-x11_0.9.9.036.bb
@@ -2,13 +2,15 @@ require ecore.inc
 DEPENDS += "evas-x11"
 PR = "r3"
 
-SRC_URI += "file://evas-x11-include.patch;patch=1"
+SRC_URI += "file://configure-abstract-sockets.patch;patch=1"
 
-EXTRA_OECONF = "--enable-ecore-fb \
+EXTRA_OECONF = "--disable-ecore-fb \
+        --disable-ecore-dfb \
 		--enable-ecore-job \
 		--enable-ecore-file \
 		--enable-ecore-dbus \
-		--enable-ecore-evas-fb \
+		--disable-ecore-evas-fb \
+		--disable-ecore-evas-dfb \
 		--enable-ecore-evas-x \
         --enable-ecore-evas-buffer \
 		--disable-ecore-evas-gl \
@@ -18,10 +20,11 @@ EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-ecore-x \
 		--enable-ecore-config \
 		--disable-openssl \
+        --enable-ecore-desktop \
 		--x-includes=${STAGING_INCDIR}/X11 \
 		--x-libraries=${STAGING_LIBDIR}	"
 
 parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \
 	 Ecore_Txt Ecore_Fb Ecore_Con \
 	 Ecore_Ipc Ecore_Evas Ecore_Config \
-	 Ecore_X"
+	 Ecore_X Ecore_Desktop"
diff --git a/packages/efl/ecore/configure.patch b/packages/efl/ecore/configure.patch
index 1e4ec58f56..23d8193b44 100644
--- a/packages/efl/ecore/configure.patch
+++ b/packages/efl/ecore/configure.patch
@@ -1,23 +1,21 @@
-diff -Nur ecore-0.9.9.032~/configure.in ecore-0.9.9.032/configure.in
---- ecore-0.9.9.032~/configure.in	2006-08-03 12:12:43.000000000 -0700
-+++ ecore-0.9.9.032/configure.in	2006-08-03 12:13:30.000000000 -0700
+--- ecore-0.9.9.036/configure.in.bak	2006-11-13 14:01:10.000000000 -0800
++++ ecore-0.9.9.036/configure.in	2006-11-13 14:02:15.000000000 -0800
 @@ -16,7 +16,6 @@
  AC_CHECK_SIZEOF(long, 4)
  AM_ENABLE_SHARED
  AM_PROG_LIBTOOL
 -AC_C___ATTRIBUTE__
  							
- dnl Set PACKAGE_DATA_DIR in config.h.
- if test "x${prefix}" = "xNONE"; then
-@@ -205,10 +204,8 @@
+ if test "x${bindir}" = 'xNONE'; then
+   if test "x${prefix}" = "xNONE"; then
+@@ -200,9 +199,7 @@
        AM_CONDITIONAL(BUILD_ECORE_X, true)
        AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
        have_ecore_x="yes"
 -      x_dir=${x_dir:-/usr/X11R6}
 -      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
 -      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-       x_ldflags=" "$ecore_x_libs;
 +      x_libs="-lX11 -lXext"
-       ecore_x_libs="-lecore_x";
+       ecore_x_libs="-lecore_x $x_libs";
      ],[
        AM_CONDITIONAL(BUILD_ECORE_X, false)
diff --git a/packages/efl/ecore/evas-x11-include.patch b/packages/efl/ecore/evas-x11-include.patch
deleted file mode 100644
index 4bb40121d0..0000000000
--- a/packages/efl/ecore/evas-x11-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ecore-0.9.9.018/src/lib/ecore_evas/ecore_evas_x.c~	2005-10-08 08:09:38.000000000 -0700
-+++ ecore-0.9.9.018/src/lib/ecore_evas/ecore_evas_x.c	2005-10-14 17:26:06.000000000 -0700
-@@ -8,6 +8,7 @@
- #include "Ecore_Evas.h"
- #ifdef BUILD_ECORE_X
- #include "Ecore_X.h"
-+#include <Evas_Engine_XRender_X11.h>
- #endif
- 
- #ifdef BUILD_ECORE_X
diff --git a/packages/efl/edje-native_0.5.0.032.bb b/packages/efl/edje-native_0.5.0.036.bb
index 9909811448..9909811448 100644
--- a/packages/efl/edje-native_0.5.0.032.bb
+++ b/packages/efl/edje-native_0.5.0.036.bb
diff --git a/packages/efl/edje-utils_0.5.0.032.bb b/packages/efl/edje-utils_0.5.0.036.bb
index f8eb917e4d..f8eb917e4d 100644
--- a/packages/efl/edje-utils_0.5.0.032.bb
+++ b/packages/efl/edje-utils_0.5.0.036.bb
diff --git a/packages/efl/edje_0.5.0.032.bb b/packages/efl/edje_0.5.0.036.bb
index d51dd119e4..d51dd119e4 100644
--- a/packages/efl/edje_0.5.0.032.bb
+++ b/packages/efl/edje_0.5.0.036.bb
diff --git a/packages/efl/eet-native_0.9.10.032.bb b/packages/efl/eet-native_0.9.10.032.bb
deleted file mode 100644
index 7369adc915..0000000000
--- a/packages/efl/eet-native_0.9.10.032.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require eet_${PV}.bb
-inherit native
-DEPENDS = "zlib-native jpeg-native"
-
-do_stage_append() {
-	install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR}
-}
diff --git a/packages/efl/eet-native_0.9.10.036.bb b/packages/efl/eet-native_0.9.10.036.bb
new file mode 100644
index 0000000000..9e2426ca9f
--- /dev/null
+++ b/packages/efl/eet-native_0.9.10.036.bb
@@ -0,0 +1,4 @@
+require eet_${PV}.bb
+inherit native
+DEPENDS = "zlib-native jpeg-native"
+
diff --git a/packages/efl/eet_0.9.10.032.bb b/packages/efl/eet_0.9.10.036.bb
index 6e6032e098..6e6032e098 100644
--- a/packages/efl/eet_0.9.10.032.bb
+++ b/packages/efl/eet_0.9.10.036.bb
diff --git a/packages/efl/embryo-native_0.9.1.032.bb b/packages/efl/embryo-native_0.9.1.036.bb
index 76fe80fe3d..76fe80fe3d 100644
--- a/packages/efl/embryo-native_0.9.1.032.bb
+++ b/packages/efl/embryo-native_0.9.1.036.bb
diff --git a/packages/efl/embryo-utils_0.9.1.032.bb b/packages/efl/embryo-utils_0.9.1.036.bb
index d507c53cce..d507c53cce 100644
--- a/packages/efl/embryo-utils_0.9.1.032.bb
+++ b/packages/efl/embryo-utils_0.9.1.036.bb
diff --git a/packages/efl/embryo_0.9.1.032.bb b/packages/efl/embryo_0.9.1.036.bb
index 0009c0a149..0009c0a149 100644
--- a/packages/efl/embryo_0.9.1.032.bb
+++ b/packages/efl/embryo_0.9.1.036.bb
diff --git a/packages/efl/evas-fb_0.9.9.032.bb b/packages/efl/evas-fb_0.9.9.036.bb
index 3e29b80cc0..3e29b80cc0 100644
--- a/packages/efl/evas-fb_0.9.9.032.bb
+++ b/packages/efl/evas-fb_0.9.9.036.bb
diff --git a/packages/efl/evas-native_0.9.9.032.bb b/packages/efl/evas-native_0.9.9.036.bb
index 68dacbc809..68dacbc809 100644
--- a/packages/efl/evas-native_0.9.9.032.bb
+++ b/packages/efl/evas-native_0.9.9.036.bb
diff --git a/packages/efl/evas-x11_0.9.9.032.bb b/packages/efl/evas-x11_0.9.9.036.bb
index 7555ecb2b0..121922591e 100644
--- a/packages/efl/evas-x11_0.9.9.032.bb
+++ b/packages/efl/evas-x11_0.9.9.036.bb
@@ -20,6 +20,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--enable-scale-sample		\
 		--enable-scale-smooth		\
 		--enable-convert-yuv		\
+        --disable-image-loader-svg  \
 		--disable-convert-8-rgb-332	\
 		--disable-convert-8-rgb-666	\
 		--disable-convert-8-rgb-232	\