summaryrefslogtreecommitdiff
path: root/packages/e17
diff options
context:
space:
mode:
Diffstat (limited to 'packages/e17')
-rw-r--r--packages/e17/e-wm/fix-configure.patch33
-rw-r--r--packages/e17/entrance/disable-autodetect.patch7
-rw-r--r--packages/e17/entrance_0.9.0.006.bb5
3 files changed, 10 insertions, 35 deletions
diff --git a/packages/e17/e-wm/fix-configure.patch b/packages/e17/e-wm/fix-configure.patch
index 02560fd7ab..13e663949c 100644
--- a/packages/e17/e-wm/fix-configure.patch
+++ b/packages/e17/e-wm/fix-configure.patch
@@ -12,36 +12,3 @@ diff -Nur e~/configure.in e/configure.in
],[
AC_MSG_ERROR([Cannot find X headers and libraries.])
]
-diff -Nur e~/src/bin/Makefile.am e/src/bin/Makefile.am
---- e~/src/bin/Makefile.am 2005-09-29 13:17:29.000000000 -0700
-+++ e/src/bin/Makefile.am 2005-09-29 13:19:35.000000000 -0700
-@@ -1,6 +1,5 @@
- MAINTAINERCLEANFILES = Makefile.in
--INCLUDES = -I$(includedir) \
-- -I$(top_srcdir) \
-+INCLUDES = -I$(top_srcdir) \
- -I$(top_srcdir)/src/bin \
- -I$(top_srcdir)/src/lib \
- @e_cflags@ \
-diff -Nur e~/src/lib/Makefile.am e/src/lib/Makefile.am
---- e~/src/lib/Makefile.am 2005-09-29 13:17:29.000000000 -0700
-+++ e/src/lib/Makefile.am 2005-09-29 13:19:56.000000000 -0700
-@@ -1,6 +1,5 @@
- MAINTAINERCLEANFILES = Makefile.in
--INCLUDES = -I$(includedir) \
-- -I$(top_srcdir)/src/bin \
-+INCLUDES = -I$(top_srcdir)/src/bin \
- @e_cflags@
-
- lib_LTLIBRARIES = libe.la
-diff -Nur e~/src/preload/Makefile.am e/src/preload/Makefile.am
---- e~/src/preload/Makefile.am 2005-09-29 13:17:29.000000000 -0700
-+++ e/src/preload/Makefile.am 2005-09-29 13:19:35.000000000 -0700
-@@ -2,7 +2,6 @@
-
- INCLUDES = -I. \
- -I$(top_srcdir) \
-- -I$(includedir) \
- -I$(top_srcdir)src/preload \
- @x_cflags@
- pkgdir = $(libdir)/enlightenment/preload
diff --git a/packages/e17/entrance/disable-autodetect.patch b/packages/e17/entrance/disable-autodetect.patch
new file mode 100644
index 0000000000..7bb8fa4e74
--- /dev/null
+++ b/packages/e17/entrance/disable-autodetect.patch
@@ -0,0 +1,7 @@
+--- entrance-0.9.0.006/Makefile.am.orig 2006-04-12 22:22:44.000000000 -0700
++++ entrance-0.9.0.006/Makefile.am 2006-04-12 22:26:01.000000000 -0700
+@@ -23,4 +23,3 @@
+ fi
+
+ install-data-am:
+- sh data/config/autodetect.sh
diff --git a/packages/e17/entrance_0.9.0.006.bb b/packages/e17/entrance_0.9.0.006.bb
index 1b928b972c..4237427d63 100644
--- a/packages/e17/entrance_0.9.0.006.bb
+++ b/packages/e17/entrance_0.9.0.006.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Entrance is the Enlightenment login manager"
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 login-manager"
-RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1 login-manager"
+RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes"
HOMEPAGE = "http://www.enlightenment.org"
PR = "r13"
@@ -15,6 +15,7 @@ SRC_URI = "${E_URI}/entrance-${PV}.tar.gz \
file://set-display-env.patch;patch=1 \
file://fix-auth-mode.patch;patch=1 \
file://use-bash.patch;patch=1 \
+ file://disable-autodetect.patch;patch=1 \
file://Sessions"
S = "${WORKDIR}/entrance-${PV}"
@@ -23,7 +24,7 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
--with-xsession=/etc/X11/Xsession \
--with-auth-mode=0"
-FILES += "${datadir}"
+FILES_${PN} += "${bindir} ${sbindir} /etc ${datadir}"
do_install_append() {
install -d ${D}/etc/X11/Xsession.d