Switch to use libnotify07.

Bum PKGREVISION.

5 files changed, 55 insertions, 4 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index af0bc3a31be..8136061ed9f 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.198 2013/07/03 21:43:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.199 2013/08/14 04:35:32 obache Exp $
 
 DISTNAME=		evolution-2.32.3
-PKGREVISION=		22
+PKGREVISION=		23
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.32/}
 EXTRACT_SUFX=		.tar.bz2
@@ -80,7 +80,7 @@ BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=2.24.3
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 631c14a6a45..419d1ce7f5a 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.82 2012/09/21 11:49:20 obache Exp $
+$NetBSD: distinfo,v 1.83 2013/08/14 04:35:32 obache Exp $
 
 SHA1 (evolution-2.32.3.tar.bz2) = cc2a2126ef4192193dce50c43c5bb6fc0a57fcde
 RMD160 (evolution-2.32.3.tar.bz2) = 1b64d00a38cf8ad5c273cc4f4aee73124fe818af
@@ -7,7 +7,10 @@ SHA1 (patch-aa) = 6656278d2a54fdc585b4f0708da657ed0afbeec2
 SHA1 (patch-ab) = 792e5f7fdb0dc84fdbe0ef1ade21ce4a391e9328
 SHA1 (patch-ac) = 853fe9f4a28fa1fe1266607b93e4ef9f63969b42
 SHA1 (patch-ad) = 7efe568191ab181ea2b42ddac33db277b69b7d1e
+SHA1 (patch-calendar_gui_alarm-notify_alarm-queue.c) = 6466bcb2a53b2af82407a63d2e6439a985e286a5
 SHA1 (patch-plugins_caldav_caldav-browse-server.c) = c35c4acb0c3d28337d7aa811e81a4ce85ecec7b0
+SHA1 (patch-plugins_mail-notification_mail-notification.c) = 999ea9e55133077d1e3ed8c8dad26158b8e5260f
+SHA1 (patch-plugins_publish-calendar_publish-calendar.c) = 9af3644d68de690126c4cbaf7db9bb2da7b956b4
 SHA1 (patch-ya) = 73872309c1d69d6d10bf04d867cc04ce17e724d3
 SHA1 (patch-yb) = 6d09dceb5405b29cde657eea6fa0fbd004a8bd1f
 SHA1 (patch-yc) = 1312f89cd935dab9fd3bfae860a055d9d2fef794
diff --git a/mail/evolution/patches/patch-calendar_gui_alarm-notify_alarm-queue.c b/mail/evolution/patches/patch-calendar_gui_alarm-notify_alarm-queue.c
new file mode 100644
index 00000000000..87610996df9
--- /dev/null
+++ b/mail/evolution/patches/patch-calendar_gui_alarm-notify_alarm-queue.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-calendar_gui_alarm-notify_alarm-queue.c,v 1.1 2013/08/14 04:35:32 obache Exp $
+
+* for libnotify-0.7
+
+--- calendar/gui/alarm-notify/alarm-queue.c.orig	2011-03-29 18:38:46.000000000 +0000
++++ calendar/gui/alarm-notify/alarm-queue.c
+@@ -1606,7 +1606,7 @@ popup_notification (time_t trigger, Comp
+ 			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_notification_show(n, NULL))
+ 	    g_warning ("Could not send notification to daemon\n");
+ 
diff --git a/mail/evolution/patches/patch-plugins_mail-notification_mail-notification.c b/mail/evolution/patches/patch-plugins_mail-notification_mail-notification.c
new file mode 100644
index 00000000000..249f7d21240
--- /dev/null
+++ b/mail/evolution/patches/patch-plugins_mail-notification_mail-notification.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-plugins_mail-notification_mail-notification.c,v 1.1 2013/08/14 04:35:32 obache Exp $
+
+* for libnotify-0.7
+
+--- plugins/mail-notification/mail-notification.c.orig	2011-03-29 18:38:48.000000000 +0000
++++ plugins/mail-notification/mail-notification.c
+@@ -564,9 +564,7 @@ new_notify_status (EMEventTargetFolder *
+ 
+ 			notify  = notify_notification_new (
+ 				_("New email"), safetext,
+-				"mail-unread", NULL);
+-			notify_notification_attach_to_status_icon (
+-				notify, status_icon);
++				"mail-unread");
+ 
+ 			/* Check if actions are supported */
+ 			if (can_support_actions ()) {
diff --git a/mail/evolution/patches/patch-plugins_publish-calendar_publish-calendar.c b/mail/evolution/patches/patch-plugins_publish-calendar_publish-calendar.c
new file mode 100644
index 00000000000..7220bf1b333
--- /dev/null
+++ b/mail/evolution/patches/patch-plugins_publish-calendar_publish-calendar.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugins_publish-calendar_publish-calendar.c,v 1.1 2013/08/14 04:35:32 obache Exp $
+
+* for libnotify-0.7
+
+--- plugins/publish-calendar/publish-calendar.c.orig	2011-03-29 18:38:48.000000000 +0000
++++ plugins/publish-calendar/publish-calendar.c
+@@ -150,8 +150,7 @@ update_publish_notification (GtkMessageT
+ 				return;
+ 			}
+ 
+-			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL);
+-			notify_notification_attach_to_status_icon (notify, status_icon);
++			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name);
+ 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+ 			g_timeout_add (500, show_notify_cb, NULL);