Chase libnotify, libproxy and webkit-gtk2 shlib changes, and fix build where needed.

6 files changed, 158 insertions, 3 deletions

diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile
index 0be30d39aa62..c50afa0ccbde 100644
--- a/ports-mgmt/gnome-packagekit/Makefile
+++ b/ports-mgmt/gnome-packagekit/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Anders F Bjorklund <afb@users.sourceforge.net>
 #
 # $FreeBSD$
-#  $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.19 2010/10/04 20:40:36 kwm Exp $
+#  $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.25 2011/06/14 20:18:46 mezz Exp $
 
 PORTNAME=	gnome-packagekit
 PORTVERSION=	2.32.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt sysutils gnome
 MASTER_SITES=	GNOME
 
@@ -17,7 +17,7 @@ COMMENT=	PackageKit client programs for the GNOME desktop
 BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit \
-		notify:${PORTSDIR}/devel/libnotify \
+		notify.4:${PORTSDIR}/devel/libnotify \
 		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
 		upower-glib.1:${PORTSDIR}/sysutils/upower \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c
new file mode 100644
index 000000000000..36c7b72583a3
--- /dev/null
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c
@@ -0,0 +1,66 @@
+--- src/gpk-check-update.c.orig	2010-09-22 17:20:47.000000000 +0200
++++ src/gpk-check-update.c	2011-03-07 18:27:18.000000000 +0100
+@@ -388,9 +388,8 @@ gpk_check_update_finished_notify (GpkChe
+ 	}
+ 
+ 	/* TRANSLATORS: title: system update completed all okay */
+-	notification = notify_notification_new_with_status_icon (_("The system update has completed"),
+-								 message_text->str, "help-browser",
+-								 cupdate->priv->status_icon);
++	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) {
+@@ -456,7 +455,7 @@ gpk_check_update_show_error (GpkCheckUpd
+ 
+ 	/* do the bubble */
+ 	egg_debug ("title=%s, message=%s", title, message);
+-	notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon);
++	notification = notify_notification_new (title, message, "help-browser");
+ 	if (notification == NULL) {
+ 		egg_warning ("failed to get bubble");
+ 		goto out;
+@@ -656,7 +655,7 @@ gpk_check_update_critical_updates_warnin
+ 
+ 	/* do the bubble */
+ 	egg_debug ("title=%s, message=%s", title, message);
+-	notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon);
++	notification = notify_notification_new (title, message, "help-browser");
+ 	if (notification == NULL) {
+ 		egg_warning ("failed to get bubble");
+ 		return;
+@@ -782,9 +781,8 @@ 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_with_status_icon (_("Updates not installed"),
+-								 message, "help-browser",
+-								 cupdate->priv->status_icon);
++	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",
+@@ -839,10 +837,10 @@ gpk_check_update_notify_doing_updates (G
+ 		goto out;
+ 
+ 	/* TRANSLATORS: title: notification when we scheduled an automatic update */
+-	notification = notify_notification_new_with_status_icon (_("Updates are being installed"),
++	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", cupdate->priv->status_icon);
++						"software-update-urgent");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	/* TRANSLATORS: button: cancel the update system */
+@@ -1328,7 +1326,7 @@ gpk_check_update_get_distro_upgrades_fin
+ 
+ 	/* TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9 */
+ 	title = _("Distribution upgrades available");
+-	notification = notify_notification_new_with_status_icon (title, string->str, "help-browser", cupdate->priv->status_icon);
++	notification = notify_notification_new (title, string->str, "help-browser");
+ 	if (notification == NULL) {
+ 		egg_warning ("failed to make bubble");
+ 		goto out;
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c
new file mode 100644
index 000000000000..78c8ceaa5742
--- /dev/null
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c
@@ -0,0 +1,11 @@
+--- src/gpk-dbus-task.c.orig	2011-03-07 18:28:01.000000000 +0100
++++ src/gpk-dbus-task.c	2011-03-07 18:28:10.000000000 +0100
+@@ -377,7 +377,7 @@ gpk_dbus_task_handle_error (GpkDbusTask 
+ 	dtask->priv->cached_error_code = g_object_ref (error_code);
+ 
+ 	/* 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",
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c
new file mode 100644
index 000000000000..2fb06857631f
--- /dev/null
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c
@@ -0,0 +1,38 @@
+--- src/gpk-firmware.c.orig	2011-03-07 18:20:16.000000000 +0100
++++ src/gpk-firmware.c	2011-03-07 18:20:38.000000000 +0100
+@@ -268,7 +268,7 @@ gpk_firmware_require_restart (GpkFirmwar
+ 	message = _("You will need to restart this computer before the hardware will work correctly.");
+ 
+ 	/* TRANSLATORS: title of libnotify bubble */
+-	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL);
++	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 
+@@ -303,7 +303,7 @@ gpk_firmware_require_replug (GpkFirmware
+ 	message = _("You will need to remove and then reinsert the hardware before it will work correctly.");
+ 
+ 	/* TRANSLATORS: title of libnotify bubble */
+-	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL);
++	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 
+@@ -330,7 +330,7 @@ gpk_firmware_require_nothing (GpkFirmwar
+ 	message = _("Your hardware has been set up and is now ready to use.");
+ 
+ 	/* TRANSLATORS: title of libnotify bubble */
+-	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL);
++	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 
+@@ -624,7 +624,7 @@ gpk_firmware_timeout_cb (gpointer data)
+ 	}
+ 
+ 	/* TRANSLATORS: title of libnotify bubble */
+-	notification = notify_notification_new (_("Additional firmware required"), string->str, "help-browser", NULL);
++	notification = notify_notification_new (_("Additional firmware required"), string->str, "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/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c
new file mode 100644
index 000000000000..51cc104ea83c
--- /dev/null
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c
@@ -0,0 +1,11 @@
+--- src/gpk-hardware.c.orig	2011-03-07 18:21:23.000000000 +0100
++++ src/gpk-hardware.c	2011-03-07 18:21:32.000000000 +0100
+@@ -183,7 +183,7 @@ gpk_hardware_what_provides_cb (GObject *
+ 	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,
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c
new file mode 100644
index 000000000000..f724d7845c77
--- /dev/null
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c
@@ -0,0 +1,29 @@
+--- src/gpk-watch.c.orig	2010-09-22 17:20:31.000000000 +0200
++++ src/gpk-watch.c	2011-03-07 09:32:41.000000000 +0100
+@@ -1153,7 +1153,7 @@ gpk_watch_process_messages_cb (PkMessage
+ 	}
+ 
+ 	/* do the bubble */
+-	notification = notify_notification_new_with_status_icon (gpk_message_enum_to_localised_text (type), details, "emblem-important", watch->priv->status_icon);
++	notification = notify_notification_new (gpk_message_enum_to_localised_text (type), details, "emblem-important");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	ret = notify_notification_show (notification, &error);
+@@ -1213,7 +1213,7 @@ gpk_watch_process_error_code (GpkWatch *
+ 	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",
+@@ -1392,7 +1392,7 @@ gpk_watch_adopt_cb (PkClient *client, GA
+ 		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",