From: Paul Menzel <paulepanter@users.sourceforge.net>
Date: Fri, 18 Mar 2011 11:03:43 +0000 (+0100)
Subject: xfce_session_4.6.{1,2}: explicitely pass the path of `iceauth`
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aeb138d8c113e6c8da7d3c6804520251cd4b8ba;p=openembedded.git

xfce_session_4.6.{1,2}: explicitely pass the path of `iceauth`

Xfce Session build depends on `iceauth`, which fails when cross compiling for a different architecture.

As suggested by Khem Raj [1] pass the value, `${bindir}/iceauth` is taken as suggested by Koen Kooi [2], to the configure script so that the test is avoided.

Therefore `iceauth` is removed from `DEPENDS` and the PR variable is incremented.

This issue has been reported upstream as ticket #7420 [3].

[1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-March/031115.html
[2] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-March/031188.html
[3] http://bugzilla.xfce.org/show_bug.cgi?id=7420

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Andreas Müller <schnitzeltony@gmx.de>
---

diff --git a/recipes/xfce-base/xfce4-session_4.6.1.bb b/recipes/xfce-base/xfce4-session_4.6.1.bb
index ba66ac1efa..09e34c5d03 100644
--- a/recipes/xfce-base/xfce4-session_4.6.1.bb
+++ b/recipes/xfce-base/xfce4-session_4.6.1.bb
@@ -1,13 +1,15 @@
 DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment"
-DEPENDS = "lbwnck libxfcegui4 libxfce4util dbus iceauth xfce-utils"
+DEPENDS = "lbwnck libxfcegui4 libxfce4util dbus xfce-utils"
 SECTION = "x11"
 
-PR = "r4"
+PR = "r5"
 
 inherit xfce46
 
 RDEPENDS_${PN} = "iceauth xfce-utils xinit dbus-x11"
 
+EXTRA_OECONF += "ac_cv_path_ICEAUTH=${bindir}/iceauth"
+
 FILES_${PN} += "${libdir}/xfce4/splash/engines/*.so"
 FILES_${PN} += "${datadir}/xfce4/tips/*"
 FILES_${PN} += "${datadir}/themes/Default/balou/*"
diff --git a/recipes/xfce-base/xfce4-session_4.6.2.bb b/recipes/xfce-base/xfce4-session_4.6.2.bb
index d7f768a411..427afcbc45 100644
--- a/recipes/xfce-base/xfce4-session_4.6.2.bb
+++ b/recipes/xfce-base/xfce4-session_4.6.2.bb
@@ -1,13 +1,15 @@
 DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment"
-DEPENDS = "libwnck libxfcegui4 libxfce4util dbus iceauth xfce-utils"
+DEPENDS = "libwnck libxfcegui4 libxfce4util dbus xfce-utils"
 SECTION = "x11"
 
-PR = "r0"
+PR = "r1"
 
 inherit xfce46
 
 RDEPENDS_${PN} = "iceauth xfce-utils xinit dbus-x11"
 
+EXTRA_OECONF += "ac_cv_path_ICEAUTH=${bindir}/iceauth"
+
 FILES_${PN} += "${libdir}/xfce4/splash/engines/*.so"
 FILES_${PN} += "${datadir}/xfce4/tips/*"
 FILES_${PN} += "${datadir}/themes/Default/balou/*"