Fix building with --disable-notification.

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

diff --git a/xfce-extra/xfce4-sensors-plugin/ChangeLog b/xfce-extra/xfce4-sensors-plugin/ChangeLog
index 3b96672cca58076e8b9a911493bcb8b9ca3d61c6..41945e3156e5e1bb37492991a0ae1df18820d878 100644 (file)
--- a/xfce-extra/xfce4-sensors-plugin/ChangeLog
+++ b/xfce-extra/xfce4-sensors-plugin/ChangeLog
@@ -1,11 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-sensors-plugin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.6 2010/03/29 16:21:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.7 2010/03/29 16:55:51 ssuominen Exp $
 
   29 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-sensors-plugin-1.0.0.ebuild,
+  +files/xfce4-sensors-plugin-1.0.0-without_libnotify.patch,
   +files/xfce4-sensors-plugin-1.0.0-missing_includedir.patch:
   Fix missing -I flag for libxfce4panel headers.
+  Fix building with --disable-notification.
 
   29 Mar 2010; Jeremy Olexa <darkside@gentoo.org>
   xfce4-sensors-plugin-1.0.0.ebuild:

diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index 12e8412d619a62fde1a5d84ac33651eb59e341f8..753af0ea12f43f0748cc2aee9750f7c91fbced38 100644 (file)
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,7 +1,8 @@
 AUX xfce4-sensors-plugin-1.0.0-missing_includedir.patch 345 RMD160 2c929bbde43af885193ad8a1c57f3be4b4a91278 SHA1 6ee9594b60134f5d8e704616c903e6c7797c94d7 SHA256 11970e9b66361ffbe0b121b08a83f6831603ee7401c532b7fb3fc01c0acd2e69
+AUX xfce4-sensors-plugin-1.0.0-without_libnotify.patch 350 RMD160 1fac5102e36acd6907dc14356fa6a45e145a9876 SHA1 3f8f0c4d6064b3328cb0be2e417a82b2410780d1 SHA256 4d486593b1c2bc2557458520605648ce515bbd6f5969209ddbcca4d7054dcff1
 DIST xfce4-sensors-plugin-0.10.99.6.tar.bz2 355252 RMD160 ffbdcb365b3b3617ce7dc525d8d20a7c86dafa21 SHA1 e3af1179d3381629f23e81eb4903caf952ebb1c1 SHA256 73d4c26c9f6d98f8529d954db742ffac5559f50169a45a07a409d7cf901d3f88
 DIST xfce4-sensors-plugin-1.0.0.tar.bz2 406484 RMD160 7ba21cddf98bb9a90ff8c9abf89a994819de7fdc SHA1 5c0f2e30463068ac4ae619faf8b4966ee8d77710 SHA256 c0b1f8b63982b25c0a043f2efa0e358f9727c6eb3a55d93ff74efd76992aeae9
 EBUILD xfce4-sensors-plugin-0.10.99.6.ebuild 1404 RMD160 9008c502b40ad325e1a48947664a87118fe64bba SHA1 d3599412b1cd1d9cc19aac1af4ad10dba7892bfa SHA256 01b2368a97d241ec88942f79e6c681e149126da095b66ba047f1bd69f9d323e2
-EBUILD xfce4-sensors-plugin-1.0.0.ebuild 1516 RMD160 6f5c688d12e58002cff8c2cd57a902ba0d3947bf SHA1 1a2c470dc9ef80c1eb6877b65f8d6c2f2be273a2 SHA256 6545b22011e1ae47828f9f317a6953b89754749cc83bd19c85b16086060df543
-MISC ChangeLog 1326 RMD160 ee6a2925525b2b8d94ab20445a9cf07a83710c9c SHA1 c3c994ac32b9f838b8d698025bb3a749f22bbeb7 SHA256 001991faf0ad7fd441c330b1ee48c7953c99d73ed99339c89d42c3110566a507
+EBUILD xfce4-sensors-plugin-1.0.0.ebuild 1561 RMD160 ebd36a29c000fc91458d417454efa15f3a9b103d SHA1 b95db83d90e6e8ced529a3d998a505a4f6990373 SHA256 3c132033ae0065b5e07c7b09d90058ba84bb5dea2c6f0e7b7e0d2c62e0458620
+MISC ChangeLog 1431 RMD160 36fd7f622ae695f938af99316b78b69a63e13b74 SHA1 e134b4fad0f7a59a46b6456895c93a3cb2b0f483 SHA256 5c2c524bc0a9e5b54582306061dc982e93db4fbd850839ab1f570e04ff5c7875
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63

diff --git a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-without_libnotify.patch b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-without_libnotify.patch
new file mode 100644 (file)
index 0000000..06b0b81
--- /dev/null
+++ b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-without_libnotify.patch
@@ -0,0 +1,12 @@
+--- lib/hddtemp.c
++++ lib/hddtemp.c
+@@ -72,7 +72,9 @@
+ 
+ /* forward declaration for GCC 4.3 -Wall */
+ 
++#ifdef HAVE_LIBNOTIFY
+ void notification_suppress_messages (NotifyNotification *n, gchar *action, gpointer *data);
++#endif
+ void quick_message_notify (gchar *message);
+ void quick_message (gchar *message);
+ void read_disks_netcat (t_chip *chip);

diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0.ebuild
index d04e0ee74d02d4777b7f496610c6b21673973fff..a37226577425576ec321c8cbf776c9b9abae23d1 100644 (file)
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0.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/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0.ebuild,v 1.4 2010/03/29 16:21:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0.ebuild,v 1.5 2010/03/29 16:55:51 ssuominen Exp $
 
 EAUTORECONF=yes
 EAPI=2
@@ -43,7 +43,8 @@ pkg_setup() {
 
        DOCS="AUTHORS ChangeLog NEWS NOTES README TODO"
 
-       PATCHES=( "${FILESDIR}/${P}-missing_includedir.patch" )
+       PATCHES=( "${FILESDIR}/${P}-missing_includedir.patch"
+               "${FILESDIR}/${P}-without_libnotify.patch" )
 }
 
 src_prepare() {