Fix building with USE="-libnotify" wrt #331507 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 39 insertions, 5 deletions

diff --git a/xfce-extra/thunar-volman/ChangeLog b/xfce-extra/thunar-volman/ChangeLog
index 096a6360e90e..9825517bc62c 100644
--- a/xfce-extra/thunar-volman/ChangeLog
+++ b/xfce-extra/thunar-volman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/thunar-volman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/ChangeLog,v 1.54 2010/07/26 16:03:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/ChangeLog,v 1.55 2010/08/07 11:13:52 ssuominen Exp $
+
+  07 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  thunar-volman-0.5.1.ebuild,
+  +files/thunar-volman-0.5.1-missing_ifdef.patch:
+  Fix building with USE="-libnotify" wrt #331507 by Diego E. Pettenò.
 
 *thunar-volman-0.5.1 (26 Jul 2010)
 
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index a970211cbcc7..de6496822188 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,6 +1,7 @@
+AUX thunar-volman-0.5.1-missing_ifdef.patch 979 RMD160 da768eac7bc880417a05e14b2f18bdc24cfa0f40 SHA1 2fca34da7a68683f3532797fe4d9077f542304ae SHA256 e030e59b2f0424780eb4bdff28800f6a3e8d097125757497faf2dc09bebd26f5
 DIST thunar-volman-0.3.80.tar.bz2 353504 RMD160 9291f1fd3cf05ef9647308f5d463ea8eecbbd6b3 SHA1 c4bfbcde72baf2d4520dfa4db0de43616de7a0b8 SHA256 e400682afb0f5fcca231fe8793b31769f3645a9b5b0604d251e05b17d48217ee
 DIST thunar-volman-0.5.1.tar.bz2 384780 RMD160 bd8cb85096a64ea358b5da210252f996b57f589b SHA1 431a472b34fc30d24e8db3385b2d18ef4fe39e4c SHA256 aacc5b0d2f3ced7ea97bd60ba8d560f23c3c3492f8475fd6158387fec0bb2831
 EBUILD thunar-volman-0.3.80.ebuild 863 RMD160 46512d1544243af5b7e9081efc3f8e2a0be740ae SHA1 98b4486f67557cc3c0a71acd5bdb7636a89bb5b6 SHA256 e3c183a6332fd937947289dcbd6e3402829c590f3d19eeaa73fe14d6fe0a250d
-EBUILD thunar-volman-0.5.1.ebuild 1101 RMD160 0988e4839e4acef5ffd889f500e38e59a5f9ea1a SHA1 e1969bdd77a7e21e56a71382526d53da0d877194 SHA256 547109f8b2fa272ee9be7b5279f03507d93fd9ae896e09dcfb8e950c02663ebe
-MISC ChangeLog 6985 RMD160 4d02aa5b252ba2aaf631e438dbbdb3a1ee615c2d SHA1 724b68a03f6d26c5a5d953eaccb90d192041c3d1 SHA256 7b8005fb1dd2fba5d6d0f50d0259d079ac8dd79795da295a463f03386ac09fd0
+EBUILD thunar-volman-0.5.1.ebuild 1153 RMD160 0b51ad3f398f01d931bc307ab83550d7bb212ed8 SHA1 8803d1ea78c8e4260e4485122eb220c17afa59f1 SHA256 67e2b7bd07bc437c2be0c10f934036d2a50d273ab748b2d836e05e7aade8f4fd
+MISC ChangeLog 7191 RMD160 aeafd054416eda7451dbac4e5b8231714423b7e2 SHA1 850a1e9cf3a771fdd2c2c3df97cab79301ab8bbd SHA256 aede6ac0aa9fdd0b1d972eb3cd660d0a7df612f535bb4ad8eef1a1877da6cbcf
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-extra/thunar-volman/files/thunar-volman-0.5.1-missing_ifdef.patch b/xfce-extra/thunar-volman/files/thunar-volman-0.5.1-missing_ifdef.patch
new file mode 100644
index 000000000000..b9927d02f67f
--- /dev/null
+++ b/xfce-extra/thunar-volman/files/thunar-volman-0.5.1-missing_ifdef.patch
@@ -0,0 +1,27 @@
+http://bugs.gentoo.org/show_bug.cgi?id=331507
+http://bugzilla.xfce.org/show_bug.cgi?id=6607
+
+--- thunar-volman/tvm-input-device.c
++++ thunar-volman/tvm-input-device.c
+@@ -121,7 +121,9 @@
+       if (enabled)
+         {
+           /* display a detection notification */
++          #ifdef HAVE_LIBNOTIFY
+           tvm_notify (icon, summary, message);
++          #endif
+ 
+           /* fetch the command for the input device type and try to run it */
+           command = xfconf_channel_get_string (context->channel, command_property, NULL);
+--- thunar-volman/tvm-usb-device.c
++++ thunar-volman/tvm-usb-device.c
+@@ -80,7 +80,9 @@
+       if (enabled)
+         {
+           /* display a detection notification */
++          #ifdef HAVE_LIBNOTIFY
+           tvm_notify (icon, summary, message);
++          #endif
+ 
+           /* fetch the command for the input device type and try to run it */
+           command = xfconf_channel_get_string (context->channel, command_property, NULL);
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.5.1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.5.1.ebuild
index aaef7246ca76..cc0b28aa24ba 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.5.1.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/thunar-volman-0.5.1.ebuild,v 1.2 2010/07/26 16:20:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/thunar-volman-0.5.1.ebuild,v 1.3 2010/08/07 11:13:52 ssuominen Exp $
 
 EAPI=2
 inherit xfconf
@@ -30,8 +30,9 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext"
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
+	PATCHES=( "${FILESDIR}"/${P}-missing_ifdef.patch )
 	XFCONF="--disable-dependency-tracking
 		$(use_enable libnotify notifications)
 		$(xfconf_use_debug)"
+	DOCS="AUTHORS ChangeLog NEWS README THANKS"
 }