Mon Aug 12 09:10:09 2013 UTC ()
Switch to use libnotify07.

Bump PKGREVISION.


(obache)
diff -r1.43 -r1.44 pkgsrc/sysutils/gnome-settings-daemon/Makefile
diff -r1.12 -r1.13 pkgsrc/sysutils/gnome-settings-daemon/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/gnome-settings-daemon/patches/patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c
diff -r0 -r1.1 pkgsrc/sysutils/gnome-settings-daemon/patches/patch-plugins_xrandr_gsd-xrandr-manager.c
cvs diff -r1.43 -r1.44 pkgsrc/sysutils/gnome-settings-daemon/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/Makefile 2013/06/06 12:55:04 1.43
+++ pkgsrc/sysutils/gnome-settings-daemon/Makefile 2013/08/12 09:10:09 1.44
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.43 2013/06/06 12:55:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2013/08/12 09:10:09 obache Exp $
2# 2#
3 3
4DISTNAME= gnome-settings-daemon-2.32.1 4DISTNAME= gnome-settings-daemon-2.32.1
5PKGREVISION= 20 5PKGREVISION= 21
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.32/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.32/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= GNOME settings daemon 12COMMENT= GNOME settings daemon
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config intltool gmake msgfmt 16USE_TOOLS+= pkg-config intltool gmake msgfmt
17 17
18CONFLICTS+= gnome-control-center<2.22.0 18CONFLICTS+= gnome-control-center<2.22.0
@@ -33,23 +33,23 @@ PKG_SUPPORTED_OPTIONS= pulseaudio @@ -33,23 +33,23 @@ PKG_SUPPORTED_OPTIONS= pulseaudio
33PLIST_VARS+= pulseaudio 33PLIST_VARS+= pulseaudio
34 34
35.if !empty(PKG_OPTIONS:Mpulseaudio) 35.if !empty(PKG_OPTIONS:Mpulseaudio)
36PLIST.pulseaudio= yes 36PLIST.pulseaudio= yes
37BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=0.9.15 37BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=0.9.15
38.include "../../audio/pulseaudio/buildlink3.mk" 38.include "../../audio/pulseaudio/buildlink3.mk"
39.include "../../audio/libcanberra/buildlink3.mk" 39.include "../../audio/libcanberra/buildlink3.mk"
40.endif 40.endif
41.include "../../devel/GConf/schemas.mk" 41.include "../../devel/GConf/schemas.mk"
42.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 42.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
43BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.74 43BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.74
44.include "../../sysutils/dbus-glib/buildlink3.mk" 44.include "../../sysutils/dbus-glib/buildlink3.mk"
45.include "../../sysutils/desktop-file-utils/desktopdb.mk" 45.include "../../sysutils/desktop-file-utils/desktopdb.mk"
46.include "../../sysutils/libnotify/buildlink3.mk" 46.include "../../sysutils/libnotify07/buildlink3.mk"
47.include "../../x11/gnome-desktop/buildlink3.mk" 47.include "../../x11/gnome-desktop/buildlink3.mk"
48BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.21.2 48BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.21.2
49.include "../../x11/gtk2/buildlink3.mk" 49.include "../../x11/gtk2/buildlink3.mk"
50BUILDLINK_API_DEPENDS.libgnomekbd+= libgnomekbd>=2.31.2 50BUILDLINK_API_DEPENDS.libgnomekbd+= libgnomekbd>=2.31.2
51.include "../../x11/libgnomekbd/buildlink3.mk" 51.include "../../x11/libgnomekbd/buildlink3.mk"
52BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=5.0 52BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=5.0
53.include "../../x11/libxklavier/buildlink3.mk" 53.include "../../x11/libxklavier/buildlink3.mk"
54 54
55.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/sysutils/gnome-settings-daemon/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/distinfo 2010/11/24 20:51:19 1.12
+++ pkgsrc/sysutils/gnome-settings-daemon/distinfo 2013/08/12 09:10:09 1.13
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.12 2010/11/24 20:51:19 drochner Exp $ 1$NetBSD: distinfo,v 1.13 2013/08/12 09:10:09 obache Exp $
2 2
3SHA1 (gnome-settings-daemon-2.32.1.tar.bz2) = f2550acb4a9fd8f96ead1263ba5739915c303f6e 3SHA1 (gnome-settings-daemon-2.32.1.tar.bz2) = f2550acb4a9fd8f96ead1263ba5739915c303f6e
4RMD160 (gnome-settings-daemon-2.32.1.tar.bz2) = 71aef9419eeca5f9fa59bb55990327c307f9ca31 4RMD160 (gnome-settings-daemon-2.32.1.tar.bz2) = 71aef9419eeca5f9fa59bb55990327c307f9ca31
5Size (gnome-settings-daemon-2.32.1.tar.bz2) = 1331850 bytes 5Size (gnome-settings-daemon-2.32.1.tar.bz2) = 1331850 bytes
6SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23 6SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
 7SHA1 (patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c) = 367d8983fbdd3b26cee56b363954d43e01051d5a
 8SHA1 (patch-plugins_xrandr_gsd-xrandr-manager.c) = 8d923fff84961b6ad4a7cecd58985cea66e8825c
File Added: pkgsrc/sysutils/gnome-settings-daemon/patches/Attic/patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c
$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,
File Added: pkgsrc/sysutils/gnome-settings-daemon/patches/Attic/patch-plugins_xrandr_gsd-xrandr-manager.c
$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