Switch to use libnotify07.

Bump PKGREVISION.

4 files changed, 62 insertions, 4 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 0bc715e1ab8..b9d4c363d1e 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2013/06/06 12:55:04 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2013/08/12 09:10:09 obache Exp $
 #
 
 DISTNAME=	gnome-settings-daemon-2.32.1
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -43,7 +43,7 @@ BUILDLINK_API_DEPENDS.pulseaudio+=	pulseaudio>=0.9.15
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.21.2
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index bafc44fb555..2f3b962fdec 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.12 2010/11/24 20:51:19 drochner Exp $
+$NetBSD: distinfo,v 1.13 2013/08/12 09:10:09 obache Exp $
 
 SHA1 (gnome-settings-daemon-2.32.1.tar.bz2) = f2550acb4a9fd8f96ead1263ba5739915c303f6e
 RMD160 (gnome-settings-daemon-2.32.1.tar.bz2) = 71aef9419eeca5f9fa59bb55990327c307f9ca31
 Size (gnome-settings-daemon-2.32.1.tar.bz2) = 1331850 bytes
 SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
+SHA1 (patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c) = 367d8983fbdd3b26cee56b363954d43e01051d5a
+SHA1 (patch-plugins_xrandr_gsd-xrandr-manager.c) = 8d923fff84961b6ad4a7cecd58985cea66e8825c
diff --git a/sysutils/gnome-settings-daemon/patches/patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c b/sysutils/gnome-settings-daemon/patches/patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c
new file mode 100644
index 00000000000..3b9d82c669f
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/patches/patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c
@@ -0,0 +1,29 @@
+$NetBSD: patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c,v 1.1 2013/08/12 09:10:09 obache Exp $
+
+* Require libnotify 0.6.0
+  https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=e1ab570b0dce479ba235e5542ea07d1b5bafc4c9
+
+--- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c.orig	2010-11-15 13:10:51.000000000 +0000
++++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11y
+         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+         manager->priv->notification = notify_notification_new (title,
+                                                                message,
+-                                                               "preferences-desktop-accessibility",
+-                                                               NULL);
+-        notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++                                                               "preferences-desktop-accessibility");
+         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+ 
+         notify_notification_add_action (manager->priv->notification,
+@@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA1
+         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+         manager->priv->notification = notify_notification_new (title,
+                                                                message,
+-                                                               "preferences-desktop-accessibility",
+-                                                               NULL);
+-        notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++                                                               "preferences-desktop-accessibility");
+         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+ 
+         notify_notification_add_action (manager->priv->notification,
diff --git a/sysutils/gnome-settings-daemon/patches/patch-plugins_xrandr_gsd-xrandr-manager.c b/sysutils/gnome-settings-daemon/patches/patch-plugins_xrandr_gsd-xrandr-manager.c
new file mode 100644
index 00000000000..0c458e63106
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/patches/patch-plugins_xrandr_gsd-xrandr-manager.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-plugins_xrandr_gsd-xrandr-manager.c,v 1.1 2013/08/12 09:10:09 obache Exp $
+
+* Require libnotify 0.6.0
+  https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=e1ab570b0dce479ba235e5542ea07d1b5bafc4c9
+
+--- plugins/xrandr/gsd-xrandr-manager.c.orig	2010-11-15 13:11:00.000000000 +0000
++++ plugins/xrandr/gsd-xrandr-manager.c
+@@ -1086,16 +1086,9 @@ error_message (GsdXrandrManager *mgr, co
+ 
+         g_assert (error_to_display == NULL || secondary_text == NULL);
+ 
+-        if (priv->status_icon)
+-                notification = notify_notification_new_with_status_icon (primary_text,
+-                                                                         error_to_display ? error_to_display->message : secondary_text,
+-                                                                         GSD_XRANDR_ICON_NAME,
+-                                                                         priv->status_icon);
+-        else
+-                notification = notify_notification_new (primary_text,
+-                                                        error_to_display ? error_to_display->message : secondary_text,
+-                                                        GSD_XRANDR_ICON_NAME,
+-                                                        NULL);
++        notification = notify_notification_new (primary_text,
++                                                error_to_display ? error_to_display->message : secondary_text,
++                                                GSD_XRANDR_ICON_NAME);
+ 
+         notify_notification_show (notification, NULL); /* NULL-GError */
+ #else