e-wm_cvs.bb : fixes to e-wm from OM mtn

4 files changed, 73 insertions, 5 deletions

diff --git a/packages/e17/e-wm/enlightenment_start.oe b/packages/e17/e-wm/enlightenment_start.oe
new file mode 100644
index 0000000000..7d472fa76f
--- /dev/null
+++ b/packages/e17/e-wm/enlightenment_start.oe
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+E_PROFILE=""
+if [ -r /etc/enlightenment/default_profile ]; then
+  . /etc/enlightenment/default_profile
+fi
+
+exec enlightenment_start $E_PROFILE
diff --git a/packages/e17/e-wm/pkgconfig-fix.patch b/packages/e17/e-wm/pkgconfig-fix.patch
new file mode 100644
index 0000000000..9ea929da27
--- /dev/null
+++ b/packages/e17/e-wm/pkgconfig-fix.patch
@@ -0,0 +1,18 @@
+Index: enlightenment.pc.in
+===================================================================
+--- enlightenment.pc.in.orig	2008-03-28 22:33:51.000000000 +0100
++++ enlightenment.pc.in	2008-03-29 17:22:30.000000000 +0100
+@@ -1,11 +1,12 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/@PACKAGE@
+ 
+ Name: enlightenment
+ Description: Enlightenmnt Window Manager
+ Version: @VERSION@
++Requires: efreet >= 0.0.3.042
+ Libs: @libdir@/@PACKAGE@/modules
+ Libs.private: 
+ Cflags: -I${includedir}
diff --git a/packages/e17/e-wm/profile-search.patch b/packages/e17/e-wm/profile-search.patch
new file mode 100644
index 0000000000..7f3e9e2e29
--- /dev/null
+++ b/packages/e17/e-wm/profile-search.patch
@@ -0,0 +1,41 @@
+? .e_border.c.swn
+? .e_border.c.swo
+? .e_border.c.swp
+? .e_border.h.swp
+? .e_config.c.swp
+? .e_int_menus.c.swp
+? .e_main.c.swp
+? .e_popup.c.swp
+? .e_prefix.c.swp
+? .e_shelf.c.swo
+? .e_shelf.c.swp
+Index: e_config.c
+===================================================================
+RCS file: /var/cvs/e/e17/apps/e/src/bin/e_config.c,v
+retrieving revision 1.282
+diff -u -r1.282 e_config.c
+--- e/src/bin/e_config.c	20 Feb 2008 04:12:58 -0000	1.282
++++ e/src/bin/e_config.c	31 Mar 2008 01:57:00 -0000
+@@ -1827,7 +1827,22 @@
+      {
+ 	data = eet_data_read(ef, edd, "config");
+ 	eet_close(ef);
++        return data;
+      }
++
++   /* fallback to a system directory
++    * FIXME proper $PATH like handling might be wanted
++    */ 
++   snprintf(buf, sizeof(buf), "%s/data/config/%s/%s.cfg",
++	    e_prefix_data_get(), _e_config_profile, domain);
++   ef = eet_open(buf, EET_FILE_MODE_READ);
++   if (ef)
++     {
++	data = eet_data_read(ef, edd, "config");
++	eet_close(ef);
++        return data;
++     }
++
+    return data;
+ }
+ 
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index 9cd4ab7ffc..41e27da46a 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -2,13 +2,15 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17"
 DEPENDS = "eet evas ecore edje efreet"
 LICENSE = "MIT BSD"
 PV = "0.16.999.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r5"
 
 inherit e update-alternatives
 
 SRC_URI = "${E_CVS};module=e17/apps/e \
            file://disable-e-cursor.patch;patch=1 \
-           file://Xsession.d/98enlightenment \
+           file://pkgconfig-fix.patch;patch=1;pnum=0;mindate=20080328;maxdate=20080401 \
+           file://profile-search.patch;patch=1;mindate=20080328;maxdate=20080401 \
+           file://enlightenment_start.oe \
            file://applications.menu \
 "
 S = "${WORKDIR}/e"
@@ -34,8 +36,7 @@ do_stage() {
 
 do_install_append() {
     # customising - should rather make this simple upstream
-    install -d ${D}/${sysconfdir}/X11/Xsession.d
-    install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
+    install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir}
     install -d ${D}/${sysconfdir}/xdg/menus
     install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
 }
@@ -57,7 +58,7 @@ FILES_${PN}-dev += "\
   ${libdir}/enlightenment/preload/*.?a \
 "
 
-ALTERNATIVE_PATH = "${bindir}/enlightenment_start"
+ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
 ALTERNATIVE_NAME = "x-window-manager"
 ALTERNATIVE_LINK = "${bindir}/x-window-manager"
 ALTERNATIVE_PRIORITY = "16"