diff options
Diffstat (limited to 'packages/e17')
| -rw-r--r-- | packages/e17/entrance/Xinit.d/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/e17/entrance/Xinit.d/99entrance | 4 | ||||
| -rw-r--r-- | packages/e17/entrance/set-display-env.patch | 11 | ||||
| -rw-r--r-- | packages/e17/entrance_20050810.bb | 9 |
4 files changed, 14 insertions, 10 deletions
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 --- a/packages/e17/entrance/Xinit.d/.mtn2git_empty +++ /dev/null diff --git a/packages/e17/entrance/Xinit.d/99entrance b/packages/e17/entrance/Xinit.d/99entrance deleted file mode 100644 index 297cc909fe..0000000000 --- a/packages/e17/entrance/Xinit.d/99entrance +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -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 8a7a08b881..1c27111f49 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -3,11 +3,11 @@ SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" -RDEPENDS += "bash keylaunch detect-stylus x11-common glibc-gconv-iso8859-1" +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 = "r6" +PR = "r9" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ file://Xserver.patch;patch=1 \ @@ -15,7 +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://Xinit.d \ + file://set-display-env.patch;patch=1 \ file://Sessions" S = "${WORKDIR}/entrance" @@ -31,11 +31,8 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ FILES += "${datadir}" do_install_append() { - install -d ${D}/etc/X11/Xinit.d install -d ${D}/etc/X11/Xsession.d install -d ${D}/etc/X11/Sessions - install -m 755 ${WORKDIR}/Xinit.d/* ${D}/etc/X11/Xinit.d install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions - } |