Fix build failure with USE=-thunar, bug #544260.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 58 insertions, 18 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 5297ecbb61ee..f449fa556e02 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.253 2015/03/22 14:23:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.254 2015/04/01 16:22:15 mgorny Exp $
+
+  01 Apr 2015; Michał Górny <mgorny@gentoo.org>
+  +files/xfdesktop-4.12.1-no-thunar-build.patch, xfdesktop-4.12.1.ebuild:
+  Fix build failure with USE=-thunar, bug #544260.
 
 *xfdesktop-4.12.1 (22 Mar 2015)
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index ddeec0b548b8..57fb5be7a573 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xfdesktop-4.12.1-no-thunar-build.patch 1106 SHA256 2a44599a758209419a49fa6499091a6cdac12e1098b7dbb0a3c7579c2c9393ed SHA512 c1a8dcfccbe75033b443ddf61d5219a013f7be77feafceb377c4a3ce6057b11f0afbab0ac8c085876e904498b3404e014bd90461f4cb0412fdb9149b2d5772bb WHIRLPOOL e73af5f8111b01233f509c9f70b6e77d3c70c4c0c72a84fb7f2997e115ccd16aa1bc066a1e282d12e7c7e4e85b02eb50e27ced2c767892d07e34dfcc9b7c2154
 DIST xfdesktop-4.10.2.tar.bz2 1144561 SHA256 49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d SHA512 274e61fc08ab7738584a27cabce897bd3692200ffe88ad5542bf3c3d6fba128166a499b8aca2b571501d9c66cafa1b3af6a9d52638e20dee7dc79dc5ea48544c WHIRLPOOL 5f3b0ffcc7baf2cbc0d864038f38691f8ae60f60288ae558754d0a503373fd31ba49c605ae512c51e78614eaacb4e3c414f07bd1d46dcd151e10154486325e9f
 DIST xfdesktop-4.11.8.tar.bz2 1101322 SHA256 c17eeaecdf7bea23fac8ef64c15f7dda899ec81076c9dee99b7f74642cd8f105 SHA512 e12ac9cb4535a76118007bae882d66cdd0d095a1219cc8c33503966d51d8c3693f3bfac09c41f4310f01c9636884f1edb5c4e56fd3a319673a358c8c7cfed0ea WHIRLPOOL 1df82613aa883ff578728f89b8921352108793ae9dd67ea067bc77c4977689dc5c5cd25976d07623c768fbf0ab59b5c43ab187a0033e241847862eda3996b38b
 DIST xfdesktop-4.12.0.tar.bz2 1408116 SHA256 6e7a8b87317762214b6407576f6e2c1efcc176c136b4c7b869d18a74c87b7fc7 SHA512 b027256d0b5db13651fa2e77c4d55f31cd177469e27acb4bc9ccf87cd6d395632a65bc20b536872a065fe96f1abb7219bcd83982b44dbe3944dce2e6e5a68e18 WHIRLPOOL 3923752fd83166618bf48bb467fa767c6f742195ca3cd097e44b4fb5af0c0bb5da7c9ceab2c8ae291d65165a86a0fdfa59acbfe73730e7725a7d1344c8730648
@@ -8,25 +9,25 @@ DIST xfdesktop-4.12.1.tar.bz2 1417153 SHA256 95beff25b20957ec7b7c617b2f3f77a90b8
 EBUILD xfdesktop-4.10.2.ebuild 1291 SHA256 47b1323c03caf58e350c0dece77bd4c79eced49dc66a19775d173fe1efa39906 SHA512 930b66e05b127d74565b58d83764edd7086ddfe9fba114e69963baa3d29816d59a08af017ed76b32837b23284a9345ba3b072ff3e5012097f9343f8d297e9d14 WHIRLPOOL 86d5f2738994ec7cb46ed11946fa9c078500f96bed0c441d9221b1dcd768b0f9037e5c7255e097b35cb5e7dd7b1c2c2d7f418baeae963ebb49e8b001775daedd
 EBUILD xfdesktop-4.11.8.ebuild 1393 SHA256 af90e1ae75cc8dc8f5adb9a97374669acd70564776a9e4d79eaf410e78afc4e5 SHA512 0be6d35dccabce958fe9d849d1e18217bdb9c27594a783f5a71a130c22ac0beacfca41a19bfe6bd6e6a05cfeb69d10572d5a56f28a562e092d49acd4bcb36ab5 WHIRLPOOL 293fc01f327515fc1bc56e61722b4c4d3b524c3c634770448e9601e59a516881846e991d2178b85fa894ffa846c38ee10bd22f5439e8fed4c2bb38ce3f2750b6
 EBUILD xfdesktop-4.12.0.ebuild 1417 SHA256 460a51031671378c1514903150ff2d6d2cddafd032da8095ad7de230aab6a2ba SHA512 924c017ad0fc3f348e8e4a4fecc80f3da41e99e92c9e6f12666f1d692e3b63123394a9782d73a7766c8527327dd06c225862b6edf12a27df6681b8b1e3d699b4 WHIRLPOOL addb5130662b62c3fe3d23d0da58bf856ce9603b1d7848ae0f59be18b33aa8bf6becb8f799d0f28c3b2913003bc71b697a294494f781d871a6da5a9a1bca901f
-EBUILD xfdesktop-4.12.1.ebuild 1443 SHA256 6a9b4e078fd87079db1d9f9ce1ff4a78b76032a5ff89b75a9a8db479813f421e SHA512 5f7a48107666ade3df9f4d9ff5f826f8564521f271dd30a212534e7b711de40f6ddeb48ded5aee3e1ec600bf1474408e83218ae00e516600670d66114d69d7f5 WHIRLPOOL 22c6990bf0ee8a640baef44c69db1880536e187dce19a6bb53eb6b61a9758dd995b069c9b9d007fdcd39dd12a32fd260d9ce966e7c7b098e682a503d51298ae3
-MISC ChangeLog 31617 SHA256 587f6f27add63314d56019d5d2a19a7a049b80ad5d741b07ed2262e888934945 SHA512 9397e7eea8a7a9778f8f8b301ef504eaf37d72f77b70d4d11c2887b8e388047a5301bf191aa3c1e90fa8c68e2d975efedcd0406714554c039c4ed974bca759b6 WHIRLPOOL 131acfe823a510a146b43c08d4e97353a5f06f3ae9d60aae18258fde2eda7035be74a33a2f23ffd77f75a836cf9582484030982efd288aac5d50b0753dae292e
+EBUILD xfdesktop-4.12.1.ebuild 1501 SHA256 40196a0af46983741f71f01828cad9220d34180c98df114fe01a6e9cafbba07e SHA512 ea05bc76d16be9181484ebc6bb98b632252d259b1cc8ba5d19cf3a6692783747bad4285c3cc9682257ee510cce5f0d95da3dcc691d9b8d8ce36857564107562d WHIRLPOOL ebdde9abab0a0a90b2da6167420c95a798850ac0b64514e76d55899909cfb48f430620e3ecef394eae89619257ef3e438bfa5c2822e5ece6f72b15ca18942988
+MISC ChangeLog 31793 SHA256 4b69dbd10798e8f0462d0ae71e055ac114d914c5b5a6ee1839230adf3945ebbd SHA512 01d2bdb0fb6b1b398ed7ddc2c221bfbb322dc7a44c0d87486594c55573a6da0f6b457d20d1782ada8107dad80f85f52273dadc13dcb77d35b01ee56801a7e402 WHIRLPOOL 03e49b1cc328e923300f9f106b2fdda96c4950fdaa2db22eba516fa4d07227463d09fbb1425d3c67cbce51e1f7a1e3f7f220fe95dbf339521fbf0b16a1e6c02b
 MISC metadata.xml 276 SHA256 02ac0bb7333dd11cef3a53b2d3c3cc744406509d104d37bd8bd31641646d8ae4 SHA512 dcf457c4c23b1ca2fa17ac689d29ac59a67475aa6c836fd65562f95084b42d8d763af6e90ea6db4fd1d0fc572d58c12a2fa269eb58c736a9317eb9859369bd1e WHIRLPOOL 79acb0d5a077a29a51c63f73a3f8ec1b1ab78a3c381f6dbae8d037ebb9e98bf69929ea0301da2a0e044a93469e48f3161f00fcd804a3f85df61a968597fc44bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVDtBRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVHBs8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcWgQALEU0tpMfdI7FDe3sNwAlJni
-pDYXJPbDS2wU7Rczdl38nRx4S2Qg7F9QR5HZNN+96U2CezhJ9wBpzkezKz5rgw0K
-SmxE71nXqT+MnR9GtHwjRleMh+2QZL48zQpXKZ89UpNrG90j5FZmfVbsncPs6cgS
-2rO67qQllRTMZKpvYDP4gTaL+iMmYkSZZaN5GZZKAm6CVo0qqxmvLwyoXusm8k5d
-XEN9vaRKqmFDANedZ+UZh/v7QZz+e7BgKgiF+VsO1nh4Duo1voYENIEWk2juz9gL
-IwpcdbjAZGv1c9AXVOTZXHtYGoobi7QDHiJ57jT/wzhtaRNjBVhNqDlbM+qFJUvu
-Sx6AoFUnQ1+jSYV4/OZyIgyQg5L5sGDE3JS3BdkOG7mNa3DswIcyyybLvg/iF1as
-8nlktOTD+chGmPv8GI2seCn+av2v/NVrEjg+Seclf95pqTyKLhGfY1T2T6qdG6lV
-Z8K4/7eondxObbtOAMnvf1ZLkPqmh36CFyQlB9XibuoyleU1OYm73msdN7BH2ctv
-qRjmwZFAyCjyb7ebujj2jd0pi4lnZXw1PdgYXsR3KJyiL6HFVj3Kfs3HBQ+OYeov
-/9NDuYApglkspnZx4TdKVAoYy2FR4OV2GcPRKaimPWhcwHHGnEOH4eJGaNQeZd2j
-vcPjYuiwjGFlm8TBAsKS
-=Y0Uf
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxk4QAN/DIDRpDRcdtTwm8T8ITeDk
+U8be+UXW/vHkJOoVG40LVytII6lPILh+DZ9iYP8O/VfrA+pBQqJQYvYsF1Q532qz
+f66qyCrL2kDZ6g6KNGtEdRjXL0y6KNjSFcDG44HzF14L1tD+LJsumKDLmFiejJYb
+1OAbb1xfF/WBpZHUxRsANkNaFh8G+ehFTGNP20eEMzijt/Qj0uPm8ak3BBjMeUI2
+bMM2IHv1CmJ/HEdUEHCL8FKcyb+0fXJ04QEhk5RiNlEY4mvO8XdEWPCEkUftRs5f
++A37DUQmmg4n5BpehLqYgTmLVQZpBLfiJmRBt6rAF8UVQp5zaLTEoc6hUAbTDAo5
+JNa0+vhe3xR66kAE31Jhd1rSCe07HnoCg7eZD9A/x7Flt+dpecvQPEnluzSDvwtS
+rxOKBUNUuzmEdzmeJEcfILi6VtUMja4v7pt4BTXMA+iugbJmyynafBiwCdobCdz8
+efpbS2+NQBNHP1jcg0RMYMUaxd2W4V/4PtE7esVyrBH0xmXgOqoZ8VpSzyDnbkbM
+PB3q4/oYSnfkhAgWWonz9/CvSF5rXcNgX6ZvK4FgeYodPttRn0S8Y7RsAmVSO4tj
+mK9Dwn88iBiqszwXAeNEp9puHfVBPBzklHqvRlsj13HIdlgjRrmnWxaGsQVfhwAB
+biaAe/TXjIaYoemWu70S
+=8BNB
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.12.1-no-thunar-build.patch b/xfce-base/xfdesktop/files/xfdesktop-4.12.1-no-thunar-build.patch
new file mode 100644
index 000000000000..52afb020f5bd
--- /dev/null
+++ b/xfce-base/xfdesktop/files/xfdesktop-4.12.1-no-thunar-build.patch
@@ -0,0 +1,31 @@
+From 71c8754d9978895542cf13eba8958df078a91a6c Mon Sep 17 00:00:00 2001
+From: Thaddaeus Tintenfisch <thad.fisch@gmail.com>
+Date: Sun, 29 Mar 2015 18:36:47 +0200
+Subject: [PATCH] Fix build error (Bug #11778)
+
+---
+ src/xfdesktop-icon-view.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
+index adff45c..30914c4 100644
+--- a/src/xfdesktop-icon-view.c
++++ b/src/xfdesktop-icon-view.c
+@@ -1640,6 +1640,7 @@ xfdesktop_icon_view_drag_drop(GtkWidget *widget,
+             
+             action = gdk_drag_context_get_selected_action(context);
+ 
++#ifdef ENABLE_FILE_ICONS
+             if(action == GDK_ACTION_ASK) {
+                 xfdesktop_dnd_menu(icon_view->priv->manager, icon_on_dest,
+                                    context, &action, row, col, time_);
+@@ -1649,6 +1650,7 @@ xfdesktop_icon_view_drag_drop(GtkWidget *widget,
+                     return ret;
+                 }
+             }
++#endif
+ 
+             for(l = icon_view->priv->selected_icons; l; l = l->next) {
+                 if(xfdesktop_icon_do_drop_dest(icon_on_dest,
+-- 
+2.1.4
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild
index 6eaca01c3d7c..64610fa70a72 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild,v 1.1 2015/03/22 14:23:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.12.1.ebuild,v 1.2 2015/04/01 16:22:15 mgorny Exp $
 
 EAPI=5
 inherit xfconf
@@ -38,6 +38,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-no-thunar-build.patch
+	)
+
 	XFCONF=(
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable thunar file-icons)