Switch to use libnotify07.

Bump PKGREVISION.

4 files changed, 39 insertions, 4 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 1a0829944bb..cbb63ea2858 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.116 2013/06/06 12:55:13 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2013/08/14 05:59:16 obache Exp $
 #
 
 DISTNAME=		gnome-applets-2.32.1.1
-PKGREVISION=		28
+PKGREVISION=		29
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.32/}
 EXTRACT_SUFX=		.tar.bz2
@@ -79,7 +79,7 @@ BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gnome-control-center/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 3e3ab133f69..05cd5992a78 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2010/12/16 11:37:38 ahoka Exp $
+$NetBSD: distinfo,v 1.29 2013/08/14 05:59:16 obache Exp $
 
 SHA1 (gnome-applets-2.32.1.1.tar.bz2) = 6edc3aea2bd2198b2bdbdb1fa63b481f724c8fe2
 RMD160 (gnome-applets-2.32.1.1.tar.bz2) = 50c8e169b02aa002917f4c6ea0f575522e3ae984
@@ -6,4 +6,6 @@ Size (gnome-applets-2.32.1.1.tar.bz2) = 10083534 bytes
 SHA1 (patch-aa) = 764fc46c7c000e21a1602286443e2633ec743631
 SHA1 (patch-ab) = f880abec6df2254b6541d4e5a894559763ef674b
 SHA1 (patch-ad) = 42fb64b30a031a1ea8f57f47cabdf63475b7987e
+SHA1 (patch-battstat_battstat__applet.c) = e80def5d2298785b716220b9490b4c20fe10241e
+SHA1 (patch-gweather_gweather-applet.c) = f3264b4b94a580974798ad29ebdf7f90e0963a8a
 SHA1 (patch-hal) = 8de5986b77a8ae7f99533eaff7f6a5a5c3069f3d
diff --git a/x11/gnome-applets/patches/patch-battstat_battstat__applet.c b/x11/gnome-applets/patches/patch-battstat_battstat__applet.c
new file mode 100644
index 00000000000..90c2a650015
--- /dev/null
+++ b/x11/gnome-applets/patches/patch-battstat_battstat__applet.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-battstat_battstat__applet.c,v 1.1 2013/08/14 05:59:16 obache Exp $
+
+* moved to libnotify version 0.7
+  https://git.gnome.org/browse/gnome-applets/commit/?id=f6b5bf454a61ca0090a1a32b798045a807d8ddad
+
+--- battstat/battstat_applet.c.orig	2010-11-22 14:38:27.000000000 +0000
++++ battstat/battstat_applet.c
+@@ -435,7 +435,7 @@ battery_full_notify (GtkWidget *applet)
+ 			GTK_ICON_LOOKUP_USE_BUILTIN,
+ 			NULL);
+ 	
+-	NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet);
++	NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL);
+ 
+ 	/* XXX: it would be nice to pass this as a named icon */
+ 	notify_notification_set_icon_from_pixbuf (n, icon);
diff --git a/x11/gnome-applets/patches/patch-gweather_gweather-applet.c b/x11/gnome-applets/patches/patch-gweather_gweather-applet.c
new file mode 100644
index 00000000000..3be13137f45
--- /dev/null
+++ b/x11/gnome-applets/patches/patch-gweather_gweather-applet.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-gweather_gweather-applet.c,v 1.1 2013/08/14 05:59:16 obache Exp $
+
+* moved to libnotify version 0.7
+  https://git.gnome.org/browse/gnome-applets/commit/?id=f6b5bf454a61ca0090a1a32b798045a807d8ddad
+
+--- gweather/gweather-applet.c.orig	2010-11-22 14:39:36.000000000 +0000
++++ gweather/gweather-applet.c
+@@ -471,8 +471,7 @@ update_finish (WeatherInfo *info, gpoint
+ 			 if (icon == NULL)
+ 				 icon = "stock-unknown";
+ 	           	 
+-			 n = notify_notification_new (message, detail, icon,
+-					 gw_applet->container);
++			 n = notify_notification_new (message, detail, icon);
+ 	
+ 		   	 notify_notification_show (n, &error);
+ 			 if (error)