entrance: set DISPLAY before calling Xinit

diff --git a/packages/e17/entrance/Xinit.d/99entrance b/packages/e17/entrance/Xinit.d/99entrance
index 297cc90..e524443 100644 (file)
--- a/packages/e17/entrance/Xinit.d/99entrance
+++ b/packages/e17/entrance/Xinit.d/99entrance
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-entrance
+exec entrance
 

diff --git a/packages/e17/entrance/run-Xinit.patch b/packages/e17/entrance/run-Xinit.patch
index 1d6c230..52eaae3 100644 (file)
--- a/packages/e17/entrance/run-Xinit.patch
+++ b/packages/e17/entrance/run-Xinit.patch
@@ -8,7 +8,7 @@
 +              chmod -x /etc/X11/Xinit.d/99gpe-login
 +fi
 +
-+/etc/X11/Xinit
++exec /etc/X11/Xinit
 +
  exec @prefix@/bin/entrance "$@"
  

diff --git a/packages/e17/entrance/set-display-env.patch b/packages/e17/entrance/set-display-env.patch
new file mode 100644 (file)
index 0000000..37bfc1c
--- /dev/null
+++ b/packages/e17/entrance/set-display-env.patch
@@ -0,0 +1,11 @@
+diff -Nur entrance~/src/daemon/spawner.c entrance/src/daemon/spawner.c
+--- entrance~/src/daemon/spawner.c     2005-09-02 14:00:29.000000000 -0700
++++ entrance/src/daemon/spawner.c      2005-09-02 15:53:31.000000000 -0700
+@@ -199,6 +199,7 @@
+       free(d->client.homedir);
+    d->client.homedir = NULL;
+ 
++   setenv("DISPLAY", d->name, 1);
+    snprintf(entrance_cmd, PATH_MAX, "%s -d %s", ENTRANCE, d->name);
+    if (d->config)
+       snprintf(entrance_cmd, PATH_MAX, "%s -d %s -c \"%s\" -z %d", 

diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 66a4e6e..6f9c2f1 100644 (file)
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -7,7 +7,7 @@ RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
            file://Xserver.patch;patch=1 \
@@ -15,6 +15,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/
            file://allow-missing-xsession.patch;patch=1 \
            file://run-Xinit.patch;patch=1 \
            file://use-bash.patch;patch=1 \
+           file://set-display-env.patch;patch=1 \
           file://Xinit.d \
           file://Sessions"