Switch to use libnotify07.

Bump PKGREVISION.

7 files changed, 134 insertions, 8 deletions

diff --git a/pkgtools/gnome-packagekit/Makefile b/pkgtools/gnome-packagekit/Makefile
index 0b8eeb638c5..8fc0008ed6a 100644
--- a/pkgtools/gnome-packagekit/Makefile
+++ b/pkgtools/gnome-packagekit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2013/06/06 12:54:59 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2013/08/14 05:31:04 obache Exp $
 #
 
 DISTNAME=	gnome-packagekit-0.4.0
-PKGREVISION=	27
+PKGREVISION=	28
 CATEGORIES=	pkgtools gnome
 MASTER_SITES=	http://www.packagekit.org/releases/
 
@@ -37,7 +37,7 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.30.0
 .include "../../security/policykit-gnome/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
diff --git a/pkgtools/gnome-packagekit/distinfo b/pkgtools/gnome-packagekit/distinfo
index 71e34ea689e..d99b359608b 100644
--- a/pkgtools/gnome-packagekit/distinfo
+++ b/pkgtools/gnome-packagekit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2012/12/15 09:36:21 marino Exp $
+$NetBSD: distinfo,v 1.6 2013/08/14 05:31:04 obache Exp $
 
 SHA1 (gnome-packagekit-0.4.0.tar.gz) = 8a204535c4a219b8987af756db999ec4f3caa84e
 RMD160 (gnome-packagekit-0.4.0.tar.gz) = 9c1de792b00749ea54fe44d7287cf55228df4bdf
@@ -7,9 +7,12 @@ SHA1 (patch-aa) = e9b6d7a9d8034aad4e418b7c1e6cfe753e560c0a
 SHA1 (patch-ab) = 88522542563043b06358e98fa323eb94b9e34679
 SHA1 (patch-ac) = fb0b16340091eeede5b608645b5aa43a4ab50a9f
 SHA1 (patch-aclocal.m4) = 373799ca82cc0ed53c2fc320ed375162dd417ce8
-SHA1 (patch-ad) = db285ef99ef8822f6417522a908ef976304d18c2
-SHA1 (patch-ae) = 88fd8a4f3a739af9ce06b3ca60a95a7a6ccc1c83
+SHA1 (patch-ad) = bcebb5529821434ea8d100d3c16217b1cc87e8e3
+SHA1 (patch-ae) = 5fe4044c9c2306391c245fedbe70df81f8a07148
 SHA1 (patch-configure) = 0b9e3b098ae84e559fdf74ce5c4945f8211a641d
 SHA1 (patch-configure.ac) = eb7de6a0a607803cfcf6dd7dcfaf86ad8b62a951
 SHA1 (patch-src_gpk-application.c) = 32ec24b11a222a8b77feff38373438779d46a288
+SHA1 (patch-src_gpk-client.c) = c59c0f3f345a8df579f75e07a0a40b867cbc22df
+SHA1 (patch-src_gpk-firmware.c) = 3da4ecae0241b62f709aaa0526d36c19393d0f9f
+SHA1 (patch-src_gpk-hardware.c) = e86606e4990c209d5b800c34843cc14ce405c9e0
 SHA1 (patch-src_gpk-update-viewer.c) = 20365e1f3101038b9864eda6dd5b1c0a66191bd1
diff --git a/pkgtools/gnome-packagekit/patches/patch-ad b/pkgtools/gnome-packagekit/patches/patch-ad
index aba2c56f65a..db017a8d0fa 100644
--- a/pkgtools/gnome-packagekit/patches/patch-ad
+++ b/pkgtools/gnome-packagekit/patches/patch-ad
@@ -1,7 +1,28 @@
-$NetBSD: patch-ad,v 1.1 2009/03/27 09:24:45 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2013/08/14 05:31:04 obache Exp $
+
+* for libnotify-0.7 API change.
+* gtk_status_icon_set_tooltip is deprecated
 
 --- src/gpk-check-update.c.orig	2008-11-24 16:33:50.000000000 +0000
 +++ src/gpk-check-update.c
+@@ -491,7 +491,7 @@ gpk_check_update_critical_updates_warnin
+ 	}
+ 
+ 	/* do the bubble */
+-	notification = notify_notification_new (title, message, "help-browser", NULL);
++	notification = notify_notification_new (title, message, "help-browser");
+ 	if (notification == NULL) {
+ 		egg_warning ("failed to get bubble");
+ 		return;
+@@ -617,7 +617,7 @@ gpk_check_update_check_on_battery (GpkCh
+ 	/* TRANSLATORS: policy says update, but we are on battery and so prompt */
+ 	message = _("Automatic updates are not being installed as the computer is running on battery power");
+ 	/* TRANSLATORS: informs user will not install by default */
+-	notification = notify_notification_new (_("Updates not installed"), message, "help-browser", NULL);
++	notification = notify_notification_new (_("Updates not installed"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, "do-not-show-update-not-battery",
 @@ -766,7 +766,7 @@ gpk_check_update_query_updates (GpkCheck
  	/* TRANSLATORS: tooltip: how many updates are waiting to be applied */
  	g_string_append_printf (status_tooltip, ngettext ("There is %d update pending",
@@ -11,3 +32,12 @@ $NetBSD: patch-ad,v 1.1 2009/03/27 09:24:45 wiz Exp $
  
  	/* is policy none? */
  	if (update == GPK_UPDATE_ENUM_NONE) {
+@@ -994,7 +994,7 @@ gpk_check_update_auto_get_upgrades_cb (G
+ 
+ 	/* TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9 */
+ 	title = _("Distribution upgrades available");
+-	notification = notify_notification_new (title, string->str, "help-browser", NULL);
++	notification = notify_notification_new (title, string->str, "help-browser");
+ 	if (notification == NULL) {
+ 		egg_warning ("failed to get bubble");
+ 		return;
diff --git a/pkgtools/gnome-packagekit/patches/patch-ae b/pkgtools/gnome-packagekit/patches/patch-ae
index d7a35ecb503..7688d3eb4cc 100644
--- a/pkgtools/gnome-packagekit/patches/patch-ae
+++ b/pkgtools/gnome-packagekit/patches/patch-ae
@@ -1,4 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2009/03/27 09:24:45 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2013/08/14 05:31:04 obache Exp $
+
+* gtk_status_icon_set_tooltip is deprecated
+* for libnotify-0.7 API change
 
 --- src/gpk-watch.c.orig	2008-11-24 16:34:22.000000000 +0000
 +++ src/gpk-watch.c
@@ -29,3 +32,30 @@ $NetBSD: patch-ae,v 1.1 2009/03/27 09:24:45 wiz Exp $
  			gpk_smart_icon_set_icon_name (watch->priv->sicon_restart, icon_name);
  		}
  	}
+@@ -372,7 +372,7 @@ gpk_watch_finished_cb (PkTaskList *tlist
+ 		goto out;
+ 
+ 	/* TRANSLATORS: title: an action has finished, and we are showing the libnotify bubble */
+-	notification = notify_notification_new (_("Task completed"), message, "help-browser", NULL);
++	notification = notify_notification_new (_("Task completed"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, 5000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, "do-not-show-notify-complete",
+@@ -443,7 +443,7 @@ gpk_watch_error_code_cb (PkTaskList *tli
+ 	title_prefix = g_strdup_printf ("%s: %s", _("Package Manager"), title);
+ 
+ 	/* do the bubble */
+-	notification = notify_notification_new (title_prefix, message, "help-browser", NULL);
++	notification = notify_notification_new (title_prefix, message, "help-browser");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, "show-error-details",
+@@ -491,7 +491,7 @@ gpk_watch_message_cb (PkTaskList *tlist,
+ 	escaped_details = g_markup_escape_text (details, -1);
+ 
+ 	/* do the bubble */
+-	notification = notify_notification_new (title_prefix, escaped_details, "help-browser", NULL);
++	notification = notify_notification_new (title_prefix, escaped_details, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	ret = notify_notification_show (notification, &error);
diff --git a/pkgtools/gnome-packagekit/patches/patch-src_gpk-client.c b/pkgtools/gnome-packagekit/patches/patch-src_gpk-client.c
new file mode 100644
index 00000000000..89c4d3ecc90
--- /dev/null
+++ b/pkgtools/gnome-packagekit/patches/patch-src_gpk-client.c
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_gpk-client.c,v 1.1 2013/08/14 05:31:04 obache Exp $
+
+* for libnotify-0.7 API change
+
+--- src/gpk-client.c.orig	2008-12-09 08:22:40.000000000 +0000
++++ src/gpk-client.c
+@@ -298,7 +298,7 @@ gpk_client_finished_no_progress (PkClien
+ 	}
+ 
+ 	/* TRANSLATORS: title: system update completed all okay */
+-	notification = notify_notification_new (_("The system update has completed"), message_text->str, "help-browser", NULL);
++	notification = notify_notification_new (_("The system update has completed"), message_text->str, "help-browser");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	if (restart == PK_RESTART_ENUM_SYSTEM) {
+@@ -501,7 +501,7 @@ gpk_client_error_code_cb (PkClient *clie
+ 	gclient->priv->error_details = g_markup_escape_text (details, -1);
+ 
+ 	/* do the bubble */
+-	notification = notify_notification_new (title, message, "help-browser", NULL);
++	notification = notify_notification_new (title, message, "help-browser");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, "show-error-details",
+@@ -2853,7 +2853,7 @@ gpk_client_update_system (GpkClient *gcl
+ 		notification = notify_notification_new (_("Updates are being installed"),
+ 							/* TRANSLATORS: tell the user why the hard disk is grinding... */
+ 							_("Updates are being automatically installed on your computer"),
+-							"software-update-urgent", NULL);
++							"software-update-urgent");
+ 		notify_notification_set_timeout (notification, 15000);
+ 		notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 		/* TRANSLATORS: button: cancel the update system */
diff --git a/pkgtools/gnome-packagekit/patches/patch-src_gpk-firmware.c b/pkgtools/gnome-packagekit/patches/patch-src_gpk-firmware.c
new file mode 100644
index 00000000000..2840c5d35de
--- /dev/null
+++ b/pkgtools/gnome-packagekit/patches/patch-src_gpk-firmware.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gpk-firmware.c,v 1.1 2013/08/14 05:31:04 obache Exp $
+
+* for libnotify-0.7 API change
+
+--- src/gpk-firmware.c.orig	2008-11-24 16:33:50.000000000 +0000
++++ src/gpk-firmware.c
+@@ -198,7 +198,7 @@ gpk_firmware_timeout_cb (gpointer data)
+ 	/* TRANSLATORS: we need another package to keep udev quiet */
+ 	message = _("Additional firmware is required to make hardware in this computer function correctly.");
+ 	/* TRANSLATORS: title of libnotify bubble */
+-	notification = notify_notification_new (_("Additional firmware required"), message, "help-browser", NULL);
++	notification = notify_notification_new (_("Additional firmware required"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, "install-firmware",
diff --git a/pkgtools/gnome-packagekit/patches/patch-src_gpk-hardware.c b/pkgtools/gnome-packagekit/patches/patch-src_gpk-hardware.c
new file mode 100644
index 00000000000..b721f216fe8
--- /dev/null
+++ b/pkgtools/gnome-packagekit/patches/patch-src_gpk-hardware.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gpk-hardware.c,v 1.1 2013/08/14 05:31:04 obache Exp $
+
+* for libnotify-0.7 API change
+
+--- src/gpk-hardware.c.orig	2008-11-24 16:33:50.000000000 +0000
++++ src/gpk-hardware.c
+@@ -162,7 +162,7 @@ gpk_hardware_check_for_driver_available 
+ 	message = g_strdup_printf ("%s\n\t%s", _("Additional packages can be installed to support this hardware"), package);
+ 	/* TRANSLATORS: a new bit of hardware has been plugged in */
+ 	body = g_strdup_printf ("%s", _("New hardware attached"));
+-	notification = notify_notification_new (body, message, "help-browser", NULL);
++	notification = notify_notification_new (body, message, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, GPK_HARDWARE_INSTALL_ACTION,