summaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-01-02 15:16:14 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-01-03 23:25:45 +0100
commit7478b905939713f264b6ffa7962f0723d4d730d3 (patch)
tree0ef212ae8ac96860af91e504995013d2eba497d7 /meta-xfce
parent4439af271656b7032223ebe081b7c3eab85ac395 (diff)
downloadmeta-openembedded-7478b905939713f264b6ffa7962f0723d4d730d3.tar.gz
xfce4-session: fix build on X11-less hosts
error message was: | checking for iceauth... no | configure: error: iceauth missing, please check your X11 installation Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch40
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb6
2 files changed, 44 insertions, 2 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch
new file mode 100644
index 000000000..41a527c61
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch
@@ -0,0 +1,40 @@
1From a629b051f4e5462150c77b95574bbc7a33bc9666 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Mon, 31 Dec 2012 16:35:29 +0100
4Subject: [PATCH] configure.in: hard code path to iceauth
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9workaround AC_PATH_PROG which was meant to find programs required at build-time
10not at run-time.
11
12Upstream-Status: Inappropriate [config]
13
14Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
15---
16 configure.in | 8 +-------
17 1 files changed, 1 insertions(+), 7 deletions(-)
18
19diff --git a/configure.in b/configure.in
20index 3cf3510..505e744 100644
21--- a/configure.in
22+++ b/configure.in
23@@ -111,13 +111,7 @@ XDT_FEATURE_DEBUG([xfsm_debug_default])
24 dnl Check for linker optimizations
25 XDT_FEATURE_LINKER_OPTS()
26
27-dnl Check for iceauth
28-AC_PATH_PROG([ICEAUTH], [iceauth])
29-if test x"$ICEAUTH" != x""; then
30- AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth])
31-else
32- AC_MSG_ERROR([iceauth missing, please check your X11 installation])
33-fi
34+AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$bindir/iceauth"], [path to iceauth])
35
36 dnl Find a location for the session desktop file
37 AC_MSG_CHECKING([what xsession-prefix to use])
38--
391.7.4.4
40
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
index 3bd374381..6ad834d66 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
@@ -4,14 +4,16 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" 4LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
5DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" 5DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf"
6RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower" 6RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower"
7PR = "r1" 7PR = "r2"
8 8
9inherit xfce 9inherit xfce
10 10
11SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230" 11SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230"
12SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce" 12SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce"
13SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch \ 13SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch \
14 file://0002-Remove-gnome-keyring-remains.patch" 14 file://0002-Remove-gnome-keyring-remains.patch \
15 file://0003-configure.in-hard-code-path-to-iceauth.patch \
16"
15 17
16# protect from frightening message that xfce might not work correctly 18# protect from frightening message that xfce might not work correctly
17pkg_postinst_${PN} () { 19pkg_postinst_${PN} () {