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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 56 insertions, 16 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/Manifest b/xfce-base/xfdesktop/Manifest
index 66e85ade4740..1b59f0630804 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xfdesktop-4.11.3-always-pull-in-dbus-glib.patch 1566 SHA256 42ed46f67f5cc967083c79efa8dfcc028109a7f1d501582624584994c531cb83 SHA512 828e253f34f0c4d44efa03c326eda9ad6008a3e5b99936406a8515f1d40d5ad83ea5e068c5d7fe949e91cb8787c805f0310853624fd73995a0255263913109dd WHIRLPOOL 00f269a4da4a500d149fab3959050f1a9f9dee40ba1fb7dbd41b3ac152c701cba39d0fe3a01bf11b8c10550f30f84ea0f7572dd250a7ea39ab26486adb947a47
 DIST xfdesktop-4.10.2.tar.bz2 1144561 SHA256 49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d SHA512 274e61fc08ab7738584a27cabce897bd3692200ffe88ad5542bf3c3d6fba128166a499b8aca2b571501d9c66cafa1b3af6a9d52638e20dee7dc79dc5ea48544c WHIRLPOOL 5f3b0ffcc7baf2cbc0d864038f38691f8ae60f60288ae558754d0a503373fd31ba49c605ae512c51e78614eaacb4e3c414f07bd1d46dcd151e10154486325e9f
 DIST xfdesktop-4.11.3.tar.bz2 1092584 SHA256 b7121af745bf79208380ceffa0ba377aab0c49be12ea5f8a16426b42b5e047a1 SHA512 837f72b04dad3e91244f511ce4453173325b09a3a0a78af1eb821c15af92b173a5f6aab100fcbbb00d9c49fa67f5b00641a232a3ff8b55f78dff7990942a9c59 WHIRLPOOL 9b5a7fe9b29133f431126f23e5597a2090440d70e8ad11e2ae1f7b93e9456ba06c0e7c0f5c28ebb752402fcf45a0124fa85c0b954feb29591237e9329639b081
 EBUILD xfdesktop-4.10.2.ebuild 1291 SHA256 47b1323c03caf58e350c0dece77bd4c79eced49dc66a19775d173fe1efa39906 SHA512 930b66e05b127d74565b58d83764edd7086ddfe9fba114e69963baa3d29816d59a08af017ed76b32837b23284a9345ba3b072ff3e5012097f9343f8d297e9d14 WHIRLPOOL 86d5f2738994ec7cb46ed11946fa9c078500f96bed0c441d9221b1dcd768b0f9037e5c7255e097b35cb5e7dd7b1c2c2d7f418baeae963ebb49e8b001775daedd
-EBUILD xfdesktop-4.11.3.ebuild 1305 SHA256 1c6f58c252686b386855928c845c3a5ddf8d2cbb3440454648c58c669d10a319 SHA512 3e028f9388b683a3f0e21834912c8aabc76eaa04e645faade0d4db9a70780e13788fdfbabcd98220b1ad1e35fdf3dd301952bcaa5f831e938c3c9a7b0ad6f452 WHIRLPOOL 74de22220578333951b60eb27f6b01dc8564b633925305b23982631ee288d435f0262a20bdf353b943eaaa6b2def34faf193b9cbc704836ea465057d9a6bb070
-MISC ChangeLog 29436 SHA256 8134c697dba26bb5e132bf8496c0553bf046bef6a3d186a88b79a9a74f02cc89 SHA512 1a3739cbc6cd6d3fae5f5d5decf26156bb34179a8d5a7d4b0eb93a0846b1ae163768fbbe1841e865d8986b3fc52abc7e622613497bfc7c0687e2fa8e461a5e38 WHIRLPOOL 0d32b32b3ede1b7ee07cfb6a9462b430657005a8419c75fff7fbb423f521c692be4dd28fcc96fa2e2a18a849e5be9b7f78ecf9a701b3f33f6f86a6079ab54599
+EBUILD xfdesktop-4.11.3.ebuild 1378 SHA256 317c763a38278d6203237a07509397d1293dc3385b1624176539d6af8f326ca4 SHA512 18df10d515088457ff22a9da48b98a8a1a5d860a726381a7d5b0937d105cc6b0f22687f0664c6859bbb9e85256a0b897aa55692b35e456f108cc62adcaa16a91 WHIRLPOOL 384e2a60a934b924595cfb2baf27f58262f9deb44840d216638987190ee72af0fc76e764d5876f63cdf0ebededda53f9d65e18dfc52e03957af9fa25765fa1d0
+MISC ChangeLog 29690 SHA256 7285f9555585f8c866cbc4eefafd277bb227da8b0a09c4b551aa979e72dc1da4 SHA512 7ac1d96a1b54f3b3d97dd2f73a60f4be398f0a4eeea371e95f3e6e2e4bd1adb40f1e794c1226867c95cf0599989edbef36b469ed9ed8150493d9df381dd0eb75 WHIRLPOOL 2fac5f6ed1a25429f17c180695295fd49f464cf2359180365e86a355b570b7884a0387c58974d871ecde93920747d4a88ec71f34dffcc8353e3f7074c3e8e6df
 MISC metadata.xml 276 SHA256 02ac0bb7333dd11cef3a53b2d3c3cc744406509d104d37bd8bd31641646d8ae4 SHA512 dcf457c4c23b1ca2fa17ac689d29ac59a67475aa6c836fd65562f95084b42d8d763af6e90ea6db4fd1d0fc572d58c12a2fa269eb58c736a9317eb9859369bd1e WHIRLPOOL 79acb0d5a077a29a51c63f73a3f8ec1b1ab78a3c381f6dbae8d037ebb9e98bf69929ea0301da2a0e044a93469e48f3161f00fcd804a3f85df61a968597fc44bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTHy6dAAoJEEdUh39IaPFNsnQH/jO6xiWlLHVXjep1syfwny3O
-W9QTrd8O/GCxSyj41kMuNvWv/zX/BckS3eHWaB+pJC9qVdaU+TIJE3sRuec5k8qV
-+BJzMq/HXHI4GzTVhxG+S72PJsS2j7LUGtc/S7pc2p/F2sipnee/bBLsAsyFzT54
-rtaK1GZ1U+KFRFdJrr9lwHeYxhejAw2DSQBBFw/Q9fYDxLZc06fMXfeibYvWtvCG
-pRtHYyI3eVLwD7vSyASXsYq+htH8md8K8EfCRALzoEPb/wE3LQY+DNciuhCB5R7u
-igZZ6a4mMJ3+ScSXoOEUotUiIZqiDDoKN5rdMZ7HFcLIocSH2b4Fm9LCMa2byv4=
-=AEXx
+iQEcBAEBCAAGBQJTIK40AAoJEEdUh39IaPFN3nIH/2JzQ0Y7BxTsVGhpTEiHk51p
+hCWhOfwgi+A7tOjsJZH54/JuWmAHqDlEXarfnVLg6XaAm+U7HS7ukyAtOs1Rv9/k
+XPdqMFTfVEvf4gnZLSNBGcvxuYXlE1Uep90y9NzEluvZQa2En9m/PsMilyP6nMmI
+rC4XDvuiaIjf+dGgfK9/PpcIx46HH9/eIDVlFJ/GImntgYgbfh/8ncJrS25O5hqz
+a/kCDDz5pfYhiTAVbj5tubMNcRcZRy/buUYPWJ/o2+8LhAHJ+xoBpnay5s1WlUy/
+71JjvBTB7BBaUFWMjZLaSpxrL1+60CyfyfSt3lxL2Uo9hvHAM/Kxkd5AW6Ojfvw=
+=xnuU
 -----END PGP SIGNATURE-----
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)