summaryrefslogtreecommitdiff
path: root/packages/e17
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2005-09-02 23:37:39 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-02 23:37:39 +0000
commit8cd1aca9edf298d7b359205dd3e53bfbfc4e527a (patch)
tree0ce934ecc95b9f27cb06a72f739bd9320b0169fb /packages/e17
parent92239db06f02e5914d14c890d1f65d9b93b06771 (diff)
parentd926c884b211cb6b1daa15bd99d5b68f8d39a7c9 (diff)
merge of d83dde07166637966b2851273fb1192e98171072
and dd4e3c7a09681d858be27ec82c9570a06122fe15
Diffstat (limited to 'packages/e17')
-rw-r--r--packages/e17/entrance/Xinit.d/.mtn2git_empty0
-rw-r--r--packages/e17/entrance/Xinit.d/99entrance4
-rw-r--r--packages/e17/entrance/set-display-env.patch11
-rw-r--r--packages/e17/entrance_20050810.bb3
4 files changed, 13 insertions, 5 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 66a4e6e2c3..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 <papercrane@reversefold.com>"
CVSDATE = "${PV}"
-PR = "r7"
+PR = "r9"
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"