efl, e17: update to newest versions

35 files changed, 29 insertions, 133 deletions

diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc
index ca35c83796..607acad858 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/preferred-e-versions.inc
@@ -2,29 +2,29 @@
 # Specify which versions of E-related libraries and applications to build
 #
 
-PREFERRED_VERSION_e = "0.16.999.025"
-PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
-PREFERRED_VERSION_ecore-native = "0.9.9.025"
-PREFERRED_VERSION_edb = "1.0.5.006"
-PREFERRED_VERSION_edb-native = "1.0.5.006"
-PREFERRED_VERSION_edje = "0.5.0.025"
-PREFERRED_VERSION_edje-native = "0.5.0.025"
-PREFERRED_VERSION_eet = "0.9.10.025"
-PREFERRED_VERSION_eet-native = "0.9.10.025"
-PREFERRED_VERSION_embryo = "0.9.1.025"
-PREFERRED_VERSION_embryo-native = "0.9.1.025"
-PREFERRED_VERSION_emotion = "0.0.1.004"
-PREFERRED_VERSION_emotion-native = "0.0.1.004"
-PREFERRED_VERSION_epeg = "0.9.0.006"
-PREFERRED_VERSION_epsilon = "0.3.0.006"
-PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
-PREFERRED_VERSION_evas-x11 = "0.9.9.025"
-PREFERRED_VERSION_evas-native = "0.9.9.025"
-PREFERRED_VERSION_ewl = "0.0.4.006"
-PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
-PREFERRED_VERSION_imlib2-native = "1.2.1.011"
-PREFERRED_VERSION_e-wm = "0.16.999.025"
-PREFERRED_VERSION_entrance = "0.9.0.006"
+#PREFERRED_VERSION_e = "0.16.999.025"
+#PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
+#PREFERRED_VERSION_ecore-native = "0.9.9.025"
+#PREFERRED_VERSION_edb = "1.0.5.006"
+#PREFERRED_VERSION_edb-native = "1.0.5.006"
+#PREFERRED_VERSION_edje = "0.5.0.025"
+#PREFERRED_VERSION_edje-native = "0.5.0.025"
+#PREFERRED_VERSION_eet = "0.9.10.025"
+#PREFERRED_VERSION_eet-native = "0.9.10.025"
+#PREFERRED_VERSION_embryo = "0.9.1.025"
+#PREFERRED_VERSION_embryo-native = "0.9.1.025"
+#PREFERRED_VERSION_emotion = "0.0.1.004"
+#PREFERRED_VERSION_emotion-native = "0.0.1.004"
+#PREFERRED_VERSION_epeg = "0.9.0.006"
+#PREFERRED_VERSION_epsilon = "0.3.0.006"
+#PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
+#PREFERRED_VERSION_evas-x11 = "0.9.9.025"
+#PREFERRED_VERSION_evas-native = "0.9.9.025"
+#PREFERRED_VERSION_ewl = "0.0.4.006"
+#PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
+#PREFERRED_VERSION_imlib2-native = "1.2.1.011"
+#PREFERRED_VERSION_e-wm = "0.16.999.025"
+#PREFERRED_VERSION_entrance = "0.9.0.006"
 
 PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
 PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
diff --git a/packages/e17/e-wm/remove-large-fonts.patch b/packages/e17/e-wm/remove-large-fonts.patch
deleted file mode 100644
index 8ac1721a56..0000000000
--- a/packages/e17/e-wm/remove-large-fonts.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur e~/data/fonts/Makefile.am e/data/fonts/Makefile.am
---- e~/data/fonts/Makefile.am	2005-08-31 09:54:20.000000000 -0700
-+++ e/data/fonts/Makefile.am	2005-08-31 09:54:42.000000000 -0700
-@@ -15,10 +15,6 @@
- baekmuk.COPYING \
- dotum.ttf \
- fonts.alias \
--fonts.dir \
--kochi-gothic.ttf \
--kochi.COPYING \
--fireflysung.ttf \
--fireflysung.COPYING
-+fonts.dir
- 
- EXTRA_DIST = $(files_DATA)
-diff -Nur e~/data/fonts/fonts.dir e/data/fonts/fonts.dir
---- e~/data/fonts/fonts.dir	2005-08-31 09:54:20.000000000 -0700
-+++ e/data/fonts/fonts.dir	2005-08-31 09:54:56.000000000 -0700
-@@ -50,6 +50,3 @@
- VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15
- VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9
- dotum.ttf -misc-Baekmuk Dotum-medium-r-normal--0-0-0-0-p-0-iso8859-1
--kochi-gothic.ttf -misc-Kochi Gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
--kochi-gothic.ttf -misc-Kochi Gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1
--fireflysung.ttf -misc-New Sung-medium-r-normal--0-0-0-0-p-0-iso8859-1
diff --git a/packages/e17/e-wm_0.16.999.025.bb b/packages/e17/e-wm_0.16.999.026.bb
index 85ff7e6a03..df78fbdcd0 100644
--- a/packages/e17/e-wm_0.16.999.025.bb
+++ b/packages/e17/e-wm_0.16.999.026.bb
@@ -7,7 +7,6 @@ inherit e
 
 SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
-           file://remove-large-fonts.patch;patch=1 \
            file://Xsession.d/98enlightenment"
 
 #           cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926"
diff --git a/packages/e17/entrance/disable-autodetect.patch b/packages/e17/entrance/disable-autodetect.patch
index 7bb8fa4e74..a0412b3706 100644
--- a/packages/e17/entrance/disable-autodetect.patch
+++ b/packages/e17/entrance/disable-autodetect.patch
@@ -1,7 +1,8 @@
---- entrance-0.9.0.006/Makefile.am.orig	2006-04-12 22:22:44.000000000 -0700
-+++ entrance-0.9.0.006/Makefile.am	2006-04-12 22:26:01.000000000 -0700
+diff -Nur entrance-0.9.0.007~/Makefile.am entrance-0.9.0.007/Makefile.am
+--- entrance-0.9.0.007~/Makefile.am	2006-05-11 12:18:07.000000000 -0700
++++ entrance-0.9.0.007/Makefile.am	2006-05-11 13:01:41.000000000 -0700
 @@ -23,4 +23,3 @@
  	fi
  
  install-data-am:
--	sh data/config/autodetect.sh
+-	sh data/config/autodetect.sh || :
diff --git a/packages/e17/entrance_0.9.0.006.bb b/packages/e17/entrance_0.9.0.007.bb
index 4237427d63..4237427d63 100644
--- a/packages/e17/entrance_0.9.0.006.bb
+++ b/packages/e17/entrance_0.9.0.007.bb
diff --git a/packages/efl/e_0.16.999.025.bb b/packages/efl/e_0.16.999.026.bb
index 5078c71365..5078c71365 100644
--- a/packages/efl/e_0.16.999.025.bb
+++ b/packages/efl/e_0.16.999.026.bb
diff --git a/packages/efl/ecore-fb_0.9.9.025.bb b/packages/efl/ecore-fb_0.9.9.026.bb
index a957c5dd8c..a957c5dd8c 100644
--- a/packages/efl/ecore-fb_0.9.9.025.bb
+++ b/packages/efl/ecore-fb_0.9.9.026.bb
diff --git a/packages/efl/ecore-native_0.9.9.025.bb b/packages/efl/ecore-native_0.9.9.026.bb
index 299470841c..299470841c 100644
--- a/packages/efl/ecore-native_0.9.9.025.bb
+++ b/packages/efl/ecore-native_0.9.9.026.bb
diff --git a/packages/efl/ecore-x11_0.9.9.025.bb b/packages/efl/ecore-x11_0.9.9.026.bb
index 3a88ad229b..3a88ad229b 100644
--- a/packages/efl/ecore-x11_0.9.9.025.bb
+++ b/packages/efl/ecore-x11_0.9.9.026.bb
diff --git a/packages/efl/edb-native_1.0.5.006.bb b/packages/efl/edb-native_1.0.5.007.bb
index d83a3b77c6..d83a3b77c6 100644
--- a/packages/efl/edb-native_1.0.5.006.bb
+++ b/packages/efl/edb-native_1.0.5.007.bb
diff --git a/packages/efl/edb-utils_1.0.5.006.bb b/packages/efl/edb-utils_1.0.5.007.bb
index 8d47e068a7..8d47e068a7 100644
--- a/packages/efl/edb-utils_1.0.5.006.bb
+++ b/packages/efl/edb-utils_1.0.5.007.bb
diff --git a/packages/efl/edb_1.0.5.006.bb b/packages/efl/edb_1.0.5.007.bb
index a152530b47..a152530b47 100644
--- a/packages/efl/edb_1.0.5.006.bb
+++ b/packages/efl/edb_1.0.5.007.bb
diff --git a/packages/efl/edje-native_0.5.0.025.bb b/packages/efl/edje-native_0.5.0.026.bb
index 5eb077922a..5eb077922a 100644
--- a/packages/efl/edje-native_0.5.0.025.bb
+++ b/packages/efl/edje-native_0.5.0.026.bb
diff --git a/packages/efl/edje-utils_0.5.0.025.bb b/packages/efl/edje-utils_0.5.0.026.bb
index f8eb917e4d..f8eb917e4d 100644
--- a/packages/efl/edje-utils_0.5.0.025.bb
+++ b/packages/efl/edje-utils_0.5.0.026.bb
diff --git a/packages/efl/edje_0.5.0.025.bb b/packages/efl/edje_0.5.0.026.bb
index d51dd119e4..d51dd119e4 100644
--- a/packages/efl/edje_0.5.0.025.bb
+++ b/packages/efl/edje_0.5.0.026.bb
diff --git a/packages/efl/eet-native_0.9.10.025.bb b/packages/efl/eet-native_0.9.10.026.bb
index fa20c9fb30..fa20c9fb30 100644
--- a/packages/efl/eet-native_0.9.10.025.bb
+++ b/packages/efl/eet-native_0.9.10.026.bb
diff --git a/packages/efl/eet_0.9.10.025.bb b/packages/efl/eet_0.9.10.026.bb
index 6e6032e098..6e6032e098 100644
--- a/packages/efl/eet_0.9.10.025.bb
+++ b/packages/efl/eet_0.9.10.026.bb
diff --git a/packages/efl/embryo-native_0.9.1.025.bb b/packages/efl/embryo-native_0.9.1.026.bb
index a33adb7bd2..a33adb7bd2 100644
--- a/packages/efl/embryo-native_0.9.1.025.bb
+++ b/packages/efl/embryo-native_0.9.1.026.bb
diff --git a/packages/efl/embryo-utils_0.9.1.025.bb b/packages/efl/embryo-utils_0.9.1.026.bb
index d507c53cce..d507c53cce 100644
--- a/packages/efl/embryo-utils_0.9.1.025.bb
+++ b/packages/efl/embryo-utils_0.9.1.026.bb
diff --git a/packages/efl/embryo_0.9.1.025.bb b/packages/efl/embryo_0.9.1.026.bb
index 0009c0a149..0009c0a149 100644
--- a/packages/efl/embryo_0.9.1.025.bb
+++ b/packages/efl/embryo_0.9.1.026.bb
diff --git a/packages/efl/epeg_0.9.0.006.bb b/packages/efl/epeg_0.9.0.007.bb
index c35ec63606..c35ec63606 100644
--- a/packages/efl/epeg_0.9.0.006.bb
+++ b/packages/efl/epeg_0.9.0.007.bb
diff --git a/packages/efl/epsilon_0.3.0.006.bb b/packages/efl/epsilon_0.3.0.007.bb
index 58c0f02a45..58c0f02a45 100644
--- a/packages/efl/epsilon_0.3.0.006.bb
+++ b/packages/efl/epsilon_0.3.0.007.bb
diff --git a/packages/efl/esmart-fb_0.9.0.006.bb b/packages/efl/esmart-fb_0.9.0.007.bb
index 35bef239ee..35bef239ee 100644
--- a/packages/efl/esmart-fb_0.9.0.006.bb
+++ b/packages/efl/esmart-fb_0.9.0.007.bb
diff --git a/packages/efl/esmart-x11_0.9.0.006.bb b/packages/efl/esmart-x11_0.9.0.007.bb
index cb5cc1da91..cb5cc1da91 100644
--- a/packages/efl/esmart-x11_0.9.0.006.bb
+++ b/packages/efl/esmart-x11_0.9.0.007.bb
diff --git a/packages/efl/evas-fb_0.9.9.025.bb b/packages/efl/evas-fb_0.9.9.026.bb
index 3f7847874c..3f7847874c 100644
--- a/packages/efl/evas-fb_0.9.9.025.bb
+++ b/packages/efl/evas-fb_0.9.9.026.bb
diff --git a/packages/efl/evas-native_0.9.9.025.bb b/packages/efl/evas-native_0.9.9.026.bb
index cbcbe304e9..cbcbe304e9 100644
--- a/packages/efl/evas-native_0.9.9.025.bb
+++ b/packages/efl/evas-native_0.9.9.026.bb
diff --git a/packages/efl/evas-x11_0.9.9.025.bb b/packages/efl/evas-x11_0.9.9.026.bb
index e130923816..e130923816 100644
--- a/packages/efl/evas-x11_0.9.9.025.bb
+++ b/packages/efl/evas-x11_0.9.9.026.bb
diff --git a/packages/efl/evas/fix-configure-0.9.9.025.patch b/packages/efl/evas/fix-configure-0.9.9.025.patch
deleted file mode 100644
index 61e2446c24..0000000000
--- a/packages/efl/evas/fix-configure-0.9.9.025.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- evas-0.9.9.023/configure.in~	2006-01-11 21:34:57.000000000 -0800
-+++ evas-0.9.9.023/configure.in	2006-02-03 12:15:45.000000000 -0800
-@@ -152,9 +152,7 @@
-     [
-       AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true)
-       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
--      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_libs="-lX11 -lXext"
-       ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load"
-     ],
-     [
-@@ -423,10 +421,10 @@
- 	      AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
- 	      AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
- 	      AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
--	      x_dir=${x_dir:-/usr/X11R6};
-+	      x_dir=${x_dir:-};
- 	      x_cflags=${x_cflags:--I$x_dir/include}
- 	      x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
--	      gl_cflags="-I/usr/include"
-+	      gl_cflags=""
- 	      gl_libs="-lGL -lGLU -lpthread"
- 	      gl_dir=""
- 	      ENGINE_GL_X11_PRG="evas_gl_x11_test"
-@@ -489,7 +487,7 @@
-       AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
-       AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
--      x_dir="/usr/X11R6";
-+      x_dir="";
-       x_cflags="-I"$x_dir"/include"
-       x_libs="-L"$x_dir"/lib -lX11 -lXext"
-       ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test"
diff --git a/packages/efl/evas/fix-configure-0.9.9.023.patch b/packages/efl/evas/fix-configure-0.9.9.026.patch
index 61e2446c24..61e2446c24 100644
--- a/packages/efl/evas/fix-configure-0.9.9.023.patch
+++ b/packages/efl/evas/fix-configure-0.9.9.026.patch
diff --git a/packages/efl/evas/fix-configure-20060113.patch b/packages/efl/evas/fix-configure-20060113.patch
deleted file mode 100644
index acd50c0282..0000000000
--- a/packages/efl/evas/fix-configure-20060113.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nur evas-0.9.9.015~/configure.in evas-0.9.9.015/configure.in
---- evas-0.9.9.015~/configure.in	2005-09-28 15:12:03.000000000 -0700
-+++ evas-0.9.9.015/configure.in	2005-09-28 15:13:05.000000000 -0700
-@@ -152,9 +152,7 @@
-     [
-       AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true)
-       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
--      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_libs="-lX11 -lXext";
-       ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load"
-     ],
-     [
-@@ -216,7 +214,7 @@
-         X11/X.h,
-         [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, true)
-          AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend])
--         xcb_dir=${x_dir:-/usr/X11R6}
-+         xcb_dir=${x_dir:-}
-          xcb_cflags="${x_cflags:--I${x_includes:-$x_dir/include}} $XCB_CFLAGS $XCB_ICCCM_CFLAGS"
-          xcb_libs="${x_libs:--L${x_libraries:-$x_dir/lib}}  $XCB_LIBS $XCB_ICCCM_LIBS"
-          ENGINE_SOFTWARE_XCB_PRG="evas_software_xcb_test evas_software_xcb_perf_test evas_software_xcb_perf_load"],
-@@ -430,10 +428,10 @@
- 	      AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
- 	      AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
- 	      AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
--	      x_dir=${x_dir:-/usr/X11R6};
-+	      x_dir=${x_dir:-};
- 	      x_cflags=${x_cflags:--I$x_dir/include}
- 	      x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
--	      gl_cflags="-I/usr/include"
-+	      gl_cflags=""
- 	      gl_libs="-lGL -lGLU -lpthread"
- 	      gl_dir=""
- 	      ENGINE_GL_X11_PRG="evas_gl_x11_test"
-@@ -496,7 +494,7 @@
-       AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
-       AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
--      x_dir="/usr/X11R6";
-+      x_dir="";
-       x_cflags="-I"$x_dir"/include"
-       x_libs="-L"$x_dir"/lib -lX11 -lXext"
-       ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test"
diff --git a/packages/efl/ewl_0.0.4.006.bb b/packages/efl/ewl_0.0.4.007.bb
index 85b85e0c05..85b85e0c05 100644
--- a/packages/efl/ewl_0.0.4.006.bb
+++ b/packages/efl/ewl_0.0.4.007.bb
diff --git a/packages/efl/imlib2-fb_1.2.1.011.bb b/packages/efl/imlib2-fb_1.2.2.001.bb
index 09fecdaf8b..09fecdaf8b 100644
--- a/packages/efl/imlib2-fb_1.2.1.011.bb
+++ b/packages/efl/imlib2-fb_1.2.2.001.bb
diff --git a/packages/efl/imlib2-native_1.2.1.011.bb b/packages/efl/imlib2-native_1.2.2.001.bb
index 6f8ebe477a..6f8ebe477a 100644
--- a/packages/efl/imlib2-native_1.2.1.011.bb
+++ b/packages/efl/imlib2-native_1.2.2.001.bb
diff --git a/packages/efl/imlib2-x11_1.2.1.011.bb b/packages/efl/imlib2-x11_1.2.2.001.bb
index fec8b32205..fec8b32205 100644
--- a/packages/efl/imlib2-x11_1.2.1.011.bb
+++ b/packages/efl/imlib2-x11_1.2.2.001.bb
diff --git a/packages/meta/task-opie.bb b/packages/meta/task-opie.bb
index 80bbd1384d..58feedf6c9 100644
--- a/packages/meta/task-opie.bb
+++ b/packages/meta/task-opie.bb
@@ -166,7 +166,8 @@ RDEPENDS_task-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
 RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
                         opie-rdesktop opie-wellenreiter opie-irc \
                         opie-mediaplayer2 \
-                        konqueror-embedded qpdf2"
+                        qpdf2"
+# konqueror-embedded 
 
 RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \
                          opie-tetrix"