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

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

4 files changed, 92 insertions, 4 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index de885cea9cc0..9a77f62e8f2f 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.321 2011/01/30 19:38:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.322 2011/02/05 14:24:38 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  evolution-2.32.1-r1.ebuild, +files/evolution-2.32.1-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   30 Jan 2011; Raúl Porcel <armin76@gentoo.org> evolution-2.30.3.ebuild:
   alpha/ia64/sparc stable wrt #348987
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index d37dd1177cc9..31536edcaa88 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,6 +1,7 @@
 AUX evolution-2.30.1.2-configure.patch 1243 RMD160 f7cefb76592fff6e2fba441993b546b8c9a30ca6 SHA1 6ca2073ce735bf40c4ca403d695a16976a6c3360 SHA256 c757dd941f9b4798ed6c0b5c6d23517700c9c232c60aca3b6f09f2c4278885a2
 AUX evolution-2.30.3-fix-linking-issues-in-libeshell.patch 870 RMD160 12d6fe68f2c91f5be97057a2324946eb4ce90a08 SHA1 f0e4310ca1124481373fb5760b15ccbada67cc41 SHA256 4ee4ca24cd3ff8bb27b03d262b0bb4ff8953a3973f04044984beaf2804c3d07c
 AUX evolution-2.32.0-wrong-lafile-usage.patch 634 RMD160 e14b9b17faacc3590419f7f1de78cd0f76323d58 SHA1 221fbd2112d206e52e741018c7ff2a3434819d18 SHA256 79e169a86b658bbd339fe79585f908f0eee4cfeef972be0731faa742a769deb8
+AUX evolution-2.32.1-libnotify-0.7.patch 2239 RMD160 b0d8f2e830e32d9bc227978074f7e9975ae1307a SHA1 64c1f4ed1311cead4071e7543704ee8eeca4e418 SHA256 73746e65a3ba190ace8bd1e5fc9d52f6a67556fac0ba8727d7705ffe74e3ce0d
 DIST evolution-2.30.2-patches.tar.bz2 12728 RMD160 d8058da75675a1990aad84348a40cd3f7be21aa3 SHA1 4bbb89f10ba893ef992af5fc32aad84b2ad46d2f SHA256 f3d6dcfba9ee7c21b415d04a545902cb5a28d1bcc00e579c6cc78aeac7650a45
 DIST evolution-2.30.2.tar.bz2 32570501 RMD160 c1b5703bc241a2dee20f94e60e7c9995c8cce841 SHA1 14ddccbf33eb86c976899eccea6ae1fb565ea9ca SHA256 470d12c0de9cae2dc0275152a356150c7a57339e6feca77f43508bd7d1f04d83
 DIST evolution-2.30.3.tar.bz2 32555386 RMD160 b79e3f6ba181033a9add979de8b6d518d451322c SHA1 f62e1dea59243242f626cc73ffdd68df28cedd57 SHA256 8c47e93ff5aedfad39d4224ae0751a938ccb7d2a2bcd407513cf1331c51b9cab
@@ -8,7 +9,7 @@ DIST evolution-2.32.1-patches.tar.bz2 11365 RMD160 14bae11f36e91412fb322aaca6142
 DIST evolution-2.32.1.tar.bz2 31875075 RMD160 f16b500474319570e6bac482f205db0d790bab28 SHA1 ade956b205dcdb1ba964554fb90be459e6908bac SHA256 6f6f904b5a2c6cf51f9c44317fc1990b07593eba54957c3924c2db0a235117a3
 EBUILD evolution-2.30.2-r1.ebuild 4665 RMD160 53640d9138960f8ce4314a6c676e7460c9f61fb9 SHA1 09f4cb11b2bbca0a94b72b03f5035ae1a39d1363 SHA256 732920d64450627e89f7e62a3d12fe89b31978de32c1b8205dccfa62b1681331
 EBUILD evolution-2.30.3.ebuild 4940 RMD160 19e2e143456dbeeb13630e1a26d6395319de8445 SHA1 8c9f03f36abb251a7522fb60db9572984e16e424 SHA256 90d14827d9e22f89a66a1acd7503cb39dc8518636441d2bf09c27b789762425f
-EBUILD evolution-2.32.1-r1.ebuild 5571 RMD160 ad0b1cba53a876c1768af631dd8670af162a2fbd SHA1 7ae62c0b06f614c75b5590a451d4468b70bb42c3 SHA256 1b266bd680917d555541b467b75f8608d5cfa2ab3e384f8c64a4807c25596175
+EBUILD evolution-2.32.1-r1.ebuild 5620 RMD160 5ea41aba0a953fe49de0a69117522c6615141f71 SHA1 ec0a83b8156d329b0a735cc236440f16d8c09542 SHA256 0163b411327df97fb610f02762b9cded36c357ca719e57621701e651ae13b21e
 EBUILD evolution-2.32.1.ebuild 5437 RMD160 1db85cb856faa5874bd109f8f8f6889636e6d6fa SHA1 758be483338c52ed79d102fa8444a03bdab99e31 SHA256 0201d53a9b7f6278c42a1b72b10bc09b60d229b0979f22ec90612956f8a9e4cc
-MISC ChangeLog 74827 RMD160 3ef8ef89aeacab04e679ed9cf6db795fe19ccc7e SHA1 70045465bfd6638e7cf70ba523b859333314c7df SHA256 b81cd719c1273ad85cc72f2b55882ad60024fcd38bbeb386e5580c9d5a4ea38a
+MISC ChangeLog 75006 RMD160 58699d9090cb305648270f754e38939901e50dae SHA1 8559c90fb7bb4eb4c4d47ea1184ab976f6b38e02 SHA256 953c721336c00df3bba6409d4dc0b7032d8cbdb7f78307eaa0aefc1702939c9a
 MISC metadata.xml 1123 RMD160 abcc4bc1f7bbc92df0e35db1b59056fe5a4d05d2 SHA1 ecc4a4f56aeb9b5d0d9ec612308d9cb1ef9f9f3d SHA256 b188965e8c8ce0823c081f8b86653e3848665eb4b0d59fee4176589b549c6911
diff --git a/mail-client/evolution/evolution-2.32.1-r1.ebuild b/mail-client/evolution/evolution-2.32.1-r1.ebuild
index 621a198b1aeb..15135504bc20 100644
--- a/mail-client/evolution/evolution-2.32.1-r1.ebuild
+++ b/mail-client/evolution/evolution-2.32.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1-r1.ebuild,v 1.3 2011/01/15 19:56:39 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1-r1.ebuild,v 1.4 2011/02/05 14:24:38 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -132,6 +132,8 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	# Fix invalid use of la file in contact-editor, upstream bug #635002
 	epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
 
diff --git a/mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch b/mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..7e2474b47742
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch
@@ -0,0 +1,81 @@
+--- calendar/gui/alarm-notify/alarm-queue.c
++++ calendar/gui/alarm-notify/alarm-queue.c
+@@ -40,6 +40,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ #include "alarm.h"
+@@ -1606,7 +1609,12 @@
+ 			body = g_strdup_printf ("%s %s", start_str, time_str);
+ 	}
+ 
+-	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
++	n = notify_notification_new (summary, body, "stock_appointment-reminder"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	);
++#else
++	, NULL);
++#endif
+ 	if (!notify_notification_show(n, NULL))
+ 	    g_warning ("Could not send notification to daemon\n");
+ 
+--- plugins/mail-notification/mail-notification.c
++++ plugins/mail-notification/mail-notification.c
+@@ -47,6 +47,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ #define GCONF_KEY_ROOT			"/apps/evolution/eplugin/mail-notification/"
+@@ -564,9 +567,14 @@
+ 
+ 			notify  = notify_notification_new (
+ 				_("New email"), safetext,
+-				"mail-unread", NULL);
++				"mail-unread"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++				);
++#else
++				, NULL);
+ 			notify_notification_attach_to_status_icon (
+ 				notify, status_icon);
++#endif
+ 
+ 			/* Check if actions are supported */
+ 			if (can_support_actions ()) {
+--- plugins/publish-calendar/publish-calendar.c
++++ plugins/publish-calendar/publish-calendar.c
+@@ -46,6 +46,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ static GtkListStore *store = NULL;
+@@ -150,8 +153,13 @@
+ 				return;
+ 			}
+ 
+-			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL);
++			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++			);
++#else
++			, NULL);
+ 			notify_notification_attach_to_status_icon (notify, status_icon);
++#endif
+ 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+ 			g_timeout_add (500, show_notify_cb, NULL);