summaryrefslogtreecommitdiff
path: root/packages/e17
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2005-09-02 23:22:19 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-02 23:22:19 +0000
commit98c4ffd492b19495c5cd58d6106fd927bf68f638 (patch)
tree920bee35843e5f93ea8985be21309ac09a1482f4 /packages/e17
parent7029d7e6852d5528d7b90b538ec6709d6ba968c6 (diff)
entrance: set DISPLAY before calling Xinit
Diffstat (limited to 'packages/e17')
-rw-r--r--packages/e17/entrance/Xinit.d/99entrance2
-rw-r--r--packages/e17/entrance/run-Xinit.patch2
-rw-r--r--packages/e17/entrance/set-display-env.patch11
-rw-r--r--packages/e17/entrance_20050810.bb3
4 files changed, 15 insertions, 3 deletions
diff --git a/packages/e17/entrance/Xinit.d/99entrance b/packages/e17/entrance/Xinit.d/99entrance
index 297cc909fe..e524443ec9 100644
--- 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 1d6c2307f7..52eaae3984 100644
--- 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
index 0000000000..37bfc1c2c8
--- /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 66a4e6e2c3..6f9c2f1267 100644
--- 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"