Always pull in dev-libs/dbus-glib because there are 3 source files always using it without #ifdef of anykind.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 46 insertions, 7 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 346956c89a51..8406cb11c7cb 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.238 2014/03/11 15:44:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.239 2014/03/12 19:01:39 ssuominen Exp $
+
+  12 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xfdesktop-4.11.3-always-pull-in-dbus-glib.patch,
+  xfdesktop-4.11.3.ebuild:
+  Always pull in dev-libs/dbus-glib because there are 3 source files always
+  using it without #ifdef of anykind.
 
 *xfdesktop-4.11.3 (11 Mar 2014)
 
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.11.3-always-pull-in-dbus-glib.patch b/xfce-base/xfdesktop/files/xfdesktop-4.11.3-always-pull-in-dbus-glib.patch
new file mode 100644
index 000000000000..159a3afdfdbf
--- /dev/null
+++ b/xfce-base/xfdesktop/files/xfdesktop-4.11.3-always-pull-in-dbus-glib.patch
@@ -0,0 +1,32 @@
+common/xfdesktop-thumbnailer.c, src/xfdesktop-file-utils.c and 'src/xfdesktop-file-utils.h
+always use #include <dbus/dbus-glib.h> but configure.ac doesn't check for it if
+configured with flags --disable-file-icons --disable-thunarx, causing $(DBUS_CFLAGS)
+to be unset and build to fail on a missing -I/usr/include/dbus-1.0
+
+http://bugzilla.xfce.org/show_bug.cgi?id=10745
+
+--- configure.ac
++++ configure.ac
+@@ -87,6 +87,7 @@
+ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
++XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],
+                   [libxfce4util_minimum_version])
+ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],
+@@ -124,14 +125,6 @@
+ fi
+ 
+ if test "x$enable_desktop_icons" = "xyes" -a "x$enable_file_icons" = "xyes"; then
+-    dnl here i shall abuse the XDT_CHECK_PACKAGE macro
+-    XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version], [], [
+-echo "*** Optional package dbus-glib-1 was either not found on your system"
+-echo "*** or is too old.  Please install or upgrade to at least version"
+-echo "*** dbus_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
+-echo "*** if you installed the new version of the package in a nonstandard"
+-echo "*** prefix.  File/launcher icons will be disabled."
+-])
+     enable_file_icons="no"
+     if test "x$DBUS_VERSION" != "x"; then
+         enable_file_icons="yes"
diff --git a/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild
index b7562e9661e6..11929f2aa551 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild,v 1.1 2014/03/11 15:44:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild,v 1.2 2014/03/12 19:01:39 ssuominen Exp $
 
 EAPI=5
+EAUTORECONF=1
 inherit xfconf
 
 DESCRIPTION="Desktop manager for the Xfce desktop environment"
@@ -14,7 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug libnotify thunar"
 
-RDEPEND=">=dev-libs/glib-2.20
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.20
 	>=x11-libs/gtk+-2.24:2
 	x11-libs/libSM
 	>=x11-libs/libwnck-2.30:1
@@ -25,16 +27,15 @@ RDEPEND=">=dev-libs/glib-2.20
 	>=xfce-base/libxfce4util-4.11
 	>=xfce-base/xfconf-4.10
 	libnotify? ( >=x11-libs/libnotify-0.7 )
-	thunar? (
-		>=xfce-base/thunar-1.6[dbus]
-		>=dev-libs/dbus-glib-0.100
-		)"
+	thunar? ( >=xfce-base/thunar-1.6[dbus] )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
 pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-always-pull-in-dbus-glib.patch )
+
 	XFCONF=(
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable thunar file-icons)