diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2013-01-02 15:16:14 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-01-03 23:25:45 +0100 |
| commit | 7478b905939713f264b6ffa7962f0723d4d730d3 (patch) | |
| tree | 0ef212ae8ac96860af91e504995013d2eba497d7 /meta-xfce | |
| parent | 4439af271656b7032223ebe081b7c3eab85ac395 (diff) | |
| download | meta-openembedded-contrib-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.patch | 40 | ||||
| -rw-r--r-- | meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb | 6 |
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 0000000000..41a527c61c --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch @@ -0,0 +1,40 @@ +From a629b051f4e5462150c77b95574bbc7a33bc9666 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Mon, 31 Dec 2012 16:35:29 +0100 +Subject: [PATCH] configure.in: hard code path to iceauth +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +workaround AC_PATH_PROG which was meant to find programs required at build-time +not at run-time. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.in | 8 +------- + 1 files changed, 1 insertions(+), 7 deletions(-) + +diff --git a/configure.in b/configure.in +index 3cf3510..505e744 100644 +--- a/configure.in ++++ b/configure.in +@@ -111,13 +111,7 @@ XDT_FEATURE_DEBUG([xfsm_debug_default]) + dnl Check for linker optimizations + XDT_FEATURE_LINKER_OPTS() + +-dnl Check for iceauth +-AC_PATH_PROG([ICEAUTH], [iceauth]) +-if test x"$ICEAUTH" != x""; then +- AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth]) +-else +- AC_MSG_ERROR([iceauth missing, please check your X11 installation]) +-fi ++AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$bindir/iceauth"], [path to iceauth]) + + dnl Find a location for the session desktop file + AC_MSG_CHECKING([what xsession-prefix to use]) +-- +1.7.4.4 + 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 3bd374381d..6ad834d66f 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" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower" -PR = "r1" +PR = "r2" inherit xfce SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230" SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce" SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch \ - file://0002-Remove-gnome-keyring-remains.patch" + file://0002-Remove-gnome-keyring-remains.patch \ + file://0003-configure.in-hard-code-path-to-iceauth.patch \ +" # protect from frightening message that xfce might not work correctly pkg_postinst_${PN} () { |