diff options
| -rw-r--r-- | conf/distro/openslug-packages.conf | 3 | ||||
| -rw-r--r-- | conf/distro/ucslugc-packages.conf | 3 | ||||
| -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 | 7 |
6 files changed, 15 insertions, 13 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 7f076a6c84..9a45f98e4a 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -11,8 +11,7 @@ ${PKGDIR}/packages/bash/*.bb \ ${PKGDIR}/packages/bind/*.bb \ ${PKGDIR}/packages/binutils/*.bb \ ${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/bluez-libs/*.bb \ -${PKGDIR}/packages/bluez-utils/*.bb \ +${PKGDIR}/packages/bluez/*.bb \ ${PKGDIR}/packages/boost/*.bb \ ${PKGDIR}/packages/bridge-utils/*.bb \ ${PKGDIR}/packages/busybox/*.bb \ diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index 5ecc44fb03..e2112cdbe4 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -10,8 +10,7 @@ ${PKGDIR}/packages/bash/*.bb \ ${PKGDIR}/packages/bind/*.bb \ ${PKGDIR}/packages/binutils/*.bb \ ${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/bluez-libs/*.bb \ -${PKGDIR}/packages/bluez-utils/*.bb \ +${PKGDIR}/packages/bluez/*.bb \ ${PKGDIR}/packages/boost/*.bb \ ${PKGDIR}/packages/bridge-utils/*.bb \ ${PKGDIR}/packages/busybox/*.bb \ 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..1c27111f49 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,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 - } |