Fix building with x11-libs/libnotify >= 0.7.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 66 insertions, 15 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 099082cd1ffe..60eef1ec9439 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/balsa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.104 2011/01/24 16:33:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.105 2011/02/05 10:07:19 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> balsa-2.4.8.ebuild,
+  +files/balsa-2.4.8-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> balsa-2.4.8.ebuild:
   Pin dependencies to appropriate slots.
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index acbd68df819e..b57faa2faa11 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX balsa-2.4.7-asneeded.patch 216 RMD160 22b35d2ef74038e19a28fe816bffe86e6871c180 SHA1 98f7db14052e543539948574287d1f0a8b581092 SHA256 f7a75bdf30b3c828e8e012fab33c645073687d56efaca66ce599441d686e1d05
 AUX balsa-2.4.7-build-failure-notify.patch 946 RMD160 756119e9f4f7f0877b3b43a1778a7b4cb9b0a7ce SHA1 14e6ee41935c282900aee89010f38d8ef530aa7c SHA256 a40003889650f4d91e75cc44376f47c40a53a78b72f18825fdb646a4fedc1873
+AUX balsa-2.4.8-libnotify-0.7.patch 1417 RMD160 c2b70a5fa0cda37c29c09c2fb9f76205b13569b3 SHA1 bf510a33e39aa5ace3b8c2e03f7168004d65ee26 SHA256 dce3a2223a9dfe1a866a3c6e27eed770af33925809dc68e0b9764d659d7797ad
 DIST balsa-2.4.7.tar.bz2 2926482 RMD160 4679e66423387fe16f6e3192aa61f60740c9a18a SHA1 def4bd033c0f0bfbfb8f1b2a748cabe420e57038 SHA256 581326a68a52f8344c900ca47d862536821bc5864c38b09cb6c333722a212952
 DIST balsa-2.4.8.tar.bz2 3150866 RMD160 d1723f99c4d27f722d48300863be539a5dad606a SHA1 809d44a82505ca19cb202923f0683f47c8252b70 SHA256 9b313920b754656f6c668f29675fd5630b001f4a3405f00fd9bf58d9b1f213cf
 EBUILD balsa-2.4.7.ebuild 3022 RMD160 962278743834c3e9eaad0b90e88d15e8886e4e20 SHA1 15f827c4ec0bc210bf60e9d3138704be40bf3b5e SHA256 994d6c5d2616f3f335879bcbd158f660e004388f02b367b07c147bf9cc537e33
-EBUILD balsa-2.4.8.ebuild 2679 RMD160 e88c122f3386389cb98c285b36c56c14d21d6dba SHA1 ea60b3b47a4d02ad3a2386bb9624aafc264327ab SHA256 1325e322f11987cb8d07db1c62d20ef5bf44ba0a2a93bb827e806b517d87f34b
-MISC ChangeLog 24195 RMD160 471d9052b95166238e7be3cbaf4b332b4c9da84e SHA1 3b1bf887f105b174d833df0014fa288e0d5602b4 SHA256 99de650d29ed92fce72fb079f26f721ccc5c55707787e2e39b26096a29dd4c7f
+EBUILD balsa-2.4.8.ebuild 2778 RMD160 2a28c0108ec347bd1e5abd769a4dff4ced079e6b SHA1 260af733809692b87f01fab8a4f3cc4649f86514 SHA256 0702d44aa72804cd22ce6d6faf2fe812cbf03c2c63283840b810575f2361dcd3
+MISC ChangeLog 24365 RMD160 11c97878e0a4f395f80b53a2b7e5ab4360925cc8 SHA1 57c978340fd20ab2a4d0292e179ae81c7c277b5f SHA256 02439c6ebe114f09eb82a8b2c6cd62b64c598581bfe9316a7238deb92299dcc5
 MISC metadata.xml 458 RMD160 75720f401492866e5d0c5659c53779856f6a47e9 SHA1 c678d1933c2161e59e783520548d7c69bb505049 SHA256 fe906fdde4dd35e9815a37479abbec9a15bd2854bbaa7bc648645ed3c73663ef
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk09qewACgkQ1fmVwcYIWAbi3wCeIa1mwmhf0aoOk8LPgoVW2vaH
-VVUAnRxvuwQttE5TnBZcHXzomfCEebp7
-=aASH
------END PGP SIGNATURE-----
diff --git a/mail-client/balsa/balsa-2.4.8.ebuild b/mail-client/balsa/balsa-2.4.8.ebuild
index 2390f8374334..25407a51c86c 100644
--- a/mail-client/balsa/balsa-2.4.8.ebuild
+++ b/mail-client/balsa/balsa-2.4.8.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.8.ebuild,v 1.2 2011/01/24 16:33:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.8.ebuild,v 1.3 2011/02/05 10:07:19 ssuominen Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Email client for GNOME"
 HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
@@ -100,3 +100,8 @@ pkg_setup() {
 		$(use_with ssl)
 		$(use_with xface compface)"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	gnome2_src_prepare
+}
diff --git a/mail-client/balsa/files/balsa-2.4.8-libnotify-0.7.patch b/mail-client/balsa/files/balsa-2.4.8-libnotify-0.7.patch
new file mode 100644
index 000000000000..0cef7f54ac8f
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.4.8-libnotify-0.7.patch
@@ -0,0 +1,51 @@
+--- libbalsa/information.c
++++ libbalsa/information.c
+@@ -27,6 +27,9 @@
+ 
+ #ifdef HAVE_NOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #include <gtk/gtk.h>
+ #endif
+ #include <string.h>
+@@ -122,7 +125,11 @@
+         g_free(msg);
+ 
+         note =
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++            notify_notification_new("Balsa", escaped->str, icon_str);
++#else
+             notify_notification_new("Balsa", escaped->str, icon_str, NULL);
++#endif
+         g_string_free(escaped, TRUE);
+ 
+         notify_notification_set_timeout(note, 7000);    /* 7 seconds */
+--- src/main-window.c
++++ src/main-window.c
+@@ -85,6 +85,12 @@
+ 
+ #define MAILBOX_DATA "mailbox_data"
+ 
++#ifdef HAVE_NOTIFY
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++#endif
++
+ enum {
+     OPEN_MAILBOX_NODE,
+     CLOSE_MAILBOX_NODE,
+@@ -3406,7 +3412,11 @@
+         } else {
+             num_total = num_new;
+             balsa_app.main_window->new_mail_note =
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++                notify_notification_new("Balsa", NULL, NULL);
++#else
+                 notify_notification_new("Balsa", NULL, NULL, NULL);
++#endif
+             g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
+                                                new_mail_note),
+                                       (gpointer) & balsa_app.main_window->