From 98c4ffd492b19495c5cd58d6106fd927bf68f638 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 2 Sep 2005 23:22:19 +0000 Subject: entrance: set DISPLAY before calling Xinit --- packages/e17/entrance/Xinit.d/99entrance | 2 +- packages/e17/entrance/run-Xinit.patch | 2 +- packages/e17/entrance/set-display-env.patch | 11 +++++++++++ packages/e17/entrance_20050810.bb | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 packages/e17/entrance/set-display-env.patch 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 " 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" -- cgit v1.2.3 From d926c884b211cb6b1daa15bd99d5b68f8d39a7c9 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 2 Sep 2005 23:37:00 +0000 Subject: entrance: run entrance from entrance_wrapper instead of from Xinit to fix login issues --- packages/e17/entrance/Xinit.d/.mtn2git_empty | 0 packages/e17/entrance/Xinit.d/99entrance | 4 ---- packages/e17/entrance/run-Xinit.patch | 2 +- packages/e17/entrance_20050810.bb | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 packages/e17/entrance/Xinit.d/.mtn2git_empty delete mode 100644 packages/e17/entrance/Xinit.d/99entrance diff --git a/packages/e17/entrance/Xinit.d/.mtn2git_empty b/packages/e17/entrance/Xinit.d/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/e17/entrance/Xinit.d/99entrance b/packages/e17/entrance/Xinit.d/99entrance deleted file mode 100644 index e524443ec9..0000000000 --- a/packages/e17/entrance/Xinit.d/99entrance +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -exec entrance - diff --git a/packages/e17/entrance/run-Xinit.patch b/packages/e17/entrance/run-Xinit.patch index 52eaae3984..1d6c2307f7 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 + -+exec /etc/X11/Xinit ++/etc/X11/Xinit + exec @prefix@/bin/entrance "$@" diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index 6f9c2f1267..c478452961 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 " CVSDATE = "${PV}" -PR = "r8" +PR = "r9" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ file://Xserver.patch;patch=1 \ -- cgit v1.2.3