Wed Aug 14 04:35:32 2013 UTC ()
Switch to use libnotify07.

Bum PKGREVISION.


(obache)
diff -r1.198 -r1.199 pkgsrc/mail/evolution/Makefile
diff -r1.82 -r1.83 pkgsrc/mail/evolution/distinfo
diff -r0 -r1.1 pkgsrc/mail/evolution/patches/patch-calendar_gui_alarm-notify_alarm-queue.c
diff -r0 -r1.1 pkgsrc/mail/evolution/patches/patch-plugins_mail-notification_mail-notification.c
diff -r0 -r1.1 pkgsrc/mail/evolution/patches/patch-plugins_publish-calendar_publish-calendar.c
cvs diff -r1.198 -r1.199 pkgsrc/mail/evolution/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/evolution/Makefile 2013/07/03 21:43:14 1.198
+++ pkgsrc/mail/evolution/Makefile 2013/08/14 04:35:32 1.199
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.198 2013/07/03 21:43:14 jperkin Exp $ 1# $NetBSD: Makefile,v 1.199 2013/08/14 04:35:32 obache Exp $
2 2
3DISTNAME= evolution-2.32.3 3DISTNAME= evolution-2.32.3
4PKGREVISION= 22 4PKGREVISION= 23
5CATEGORIES= mail time gnome 5CATEGORIES= mail time gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.32/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.32/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= rh@NetBSD.org 9MAINTAINER= rh@NetBSD.org
10HOMEPAGE= http://www.gnome.org/projects/evolution/ 10HOMEPAGE= http://www.gnome.org/projects/evolution/
11COMMENT= GNOME mailer, calendar, contact manager, and communications tool 11COMMENT= GNOME mailer, calendar, contact manager, and communications tool
12#LICENSE= modified-bsd AND gnu-lgpl-v2.1 AND gnu-lgpl-v3 AND perhaps more 12#LICENSE= modified-bsd AND gnu-lgpl-v2.1 AND gnu-lgpl-v3 AND perhaps more
13 13
14.include "options.mk" 14.include "options.mk"
15 15
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17USE_TOOLS+= bison gmake intltool msgfmt pkg-config 17USE_TOOLS+= bison gmake intltool msgfmt pkg-config
@@ -70,26 +70,26 @@ LDFLAGS+= -lsemaphore @@ -70,26 +70,26 @@ LDFLAGS+= -lsemaphore
70BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 70BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0
71.include "../../devel/glib2/buildlink3.mk" 71.include "../../devel/glib2/buildlink3.mk"
72BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.30.2.1 72BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.30.2.1
73.include "../../devel/libgweather/buildlink3.mk" 73.include "../../devel/libgweather/buildlink3.mk"
74.include "../../graphics/gnome-icon-theme/buildlink3.mk" 74.include "../../graphics/gnome-icon-theme/buildlink3.mk"
75.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 75.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
76.include "../../graphics/libgnomecanvas/buildlink3.mk" 76.include "../../graphics/libgnomecanvas/buildlink3.mk"
77BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=2.24.3 77BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=2.24.3
78.include "../../mail/evolution-data-server/buildlink3.mk" 78.include "../../mail/evolution-data-server/buildlink3.mk"
79.include "../../net/ORBit2/buildlink3.mk" 79.include "../../net/ORBit2/buildlink3.mk"
80.include "../../net/libsoup24/buildlink3.mk" 80.include "../../net/libsoup24/buildlink3.mk"
81.include "../../sysutils/dbus/buildlink3.mk" 81.include "../../sysutils/dbus/buildlink3.mk"
82.include "../../sysutils/dbus-glib/buildlink3.mk" 82.include "../../sysutils/dbus-glib/buildlink3.mk"
83.include "../../sysutils/libnotify/buildlink3.mk" 83.include "../../sysutils/libnotify07/buildlink3.mk"
84.include "../../sysutils/desktop-file-utils/desktopdb.mk" 84.include "../../sysutils/desktop-file-utils/desktopdb.mk"
85.include "../../textproc/libxml2/buildlink3.mk" 85.include "../../textproc/libxml2/buildlink3.mk"
86.include "../../textproc/gnome-doc-utils/buildlink3.mk" 86.include "../../textproc/gnome-doc-utils/buildlink3.mk"
87.include "../../mk/omf-scrollkeeper.mk" 87.include "../../mk/omf-scrollkeeper.mk"
88.include "../../www/gtkhtml314/buildlink3.mk" 88.include "../../www/gtkhtml314/buildlink3.mk"
89BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0 89BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0
90.include "../../x11/gtk2/buildlink3.mk" 90.include "../../x11/gtk2/buildlink3.mk"
91.include "../../x11/gnome-desktop/buildlink3.mk" 91.include "../../x11/gnome-desktop/buildlink3.mk"
92.include "../../x11/libunique/buildlink3.mk" 92.include "../../x11/libunique/buildlink3.mk"
93.include "../../audio/libcanberra/buildlink3.mk" 93.include "../../audio/libcanberra/buildlink3.mk"
94.include "../../mk/pthread.buildlink3.mk" 94.include "../../mk/pthread.buildlink3.mk"
95.include "../../mk/bsd.pkg.mk" 95.include "../../mk/bsd.pkg.mk"
cvs diff -r1.82 -r1.83 pkgsrc/mail/evolution/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/evolution/distinfo 2012/09/21 11:49:20 1.82
+++ pkgsrc/mail/evolution/distinfo 2013/08/14 04:35:32 1.83
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: distinfo,v 1.82 2012/09/21 11:49:20 obache Exp $ 1$NetBSD: distinfo,v 1.83 2013/08/14 04:35:32 obache Exp $
2 2
3SHA1 (evolution-2.32.3.tar.bz2) = cc2a2126ef4192193dce50c43c5bb6fc0a57fcde 3SHA1 (evolution-2.32.3.tar.bz2) = cc2a2126ef4192193dce50c43c5bb6fc0a57fcde
4RMD160 (evolution-2.32.3.tar.bz2) = 1b64d00a38cf8ad5c273cc4f4aee73124fe818af 4RMD160 (evolution-2.32.3.tar.bz2) = 1b64d00a38cf8ad5c273cc4f4aee73124fe818af
5Size (evolution-2.32.3.tar.bz2) = 31966138 bytes 5Size (evolution-2.32.3.tar.bz2) = 31966138 bytes
6SHA1 (patch-aa) = 6656278d2a54fdc585b4f0708da657ed0afbeec2 6SHA1 (patch-aa) = 6656278d2a54fdc585b4f0708da657ed0afbeec2
7SHA1 (patch-ab) = 792e5f7fdb0dc84fdbe0ef1ade21ce4a391e9328 7SHA1 (patch-ab) = 792e5f7fdb0dc84fdbe0ef1ade21ce4a391e9328
8SHA1 (patch-ac) = 853fe9f4a28fa1fe1266607b93e4ef9f63969b42 8SHA1 (patch-ac) = 853fe9f4a28fa1fe1266607b93e4ef9f63969b42
9SHA1 (patch-ad) = 7efe568191ab181ea2b42ddac33db277b69b7d1e 9SHA1 (patch-ad) = 7efe568191ab181ea2b42ddac33db277b69b7d1e
 10SHA1 (patch-calendar_gui_alarm-notify_alarm-queue.c) = 6466bcb2a53b2af82407a63d2e6439a985e286a5
10SHA1 (patch-plugins_caldav_caldav-browse-server.c) = c35c4acb0c3d28337d7aa811e81a4ce85ecec7b0 11SHA1 (patch-plugins_caldav_caldav-browse-server.c) = c35c4acb0c3d28337d7aa811e81a4ce85ecec7b0
 12SHA1 (patch-plugins_mail-notification_mail-notification.c) = 999ea9e55133077d1e3ed8c8dad26158b8e5260f
 13SHA1 (patch-plugins_publish-calendar_publish-calendar.c) = 9af3644d68de690126c4cbaf7db9bb2da7b956b4
11SHA1 (patch-ya) = 73872309c1d69d6d10bf04d867cc04ce17e724d3 14SHA1 (patch-ya) = 73872309c1d69d6d10bf04d867cc04ce17e724d3
12SHA1 (patch-yb) = 6d09dceb5405b29cde657eea6fa0fbd004a8bd1f 15SHA1 (patch-yb) = 6d09dceb5405b29cde657eea6fa0fbd004a8bd1f
13SHA1 (patch-yc) = 1312f89cd935dab9fd3bfae860a055d9d2fef794 16SHA1 (patch-yc) = 1312f89cd935dab9fd3bfae860a055d9d2fef794
14SHA1 (patch-yd) = 09bb3fcd4223add3880253fb43cfd036b8294d1c 17SHA1 (patch-yd) = 09bb3fcd4223add3880253fb43cfd036b8294d1c
15SHA1 (patch-ye) = 57fd2cb481a8b465b94a2155d82633f0f4b3fa06 18SHA1 (patch-ye) = 57fd2cb481a8b465b94a2155d82633f0f4b3fa06
File Added: pkgsrc/mail/evolution/patches/Attic/patch-calendar_gui_alarm-notify_alarm-queue.c
$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");
File Added: pkgsrc/mail/evolution/patches/Attic/patch-plugins_mail-notification_mail-notification.c
$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 ()) {
File Added: pkgsrc/mail/evolution/patches/Attic/patch-plugins_publish-calendar_publish-calendar.c
$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);