From 89308d33aecc7bcc79eee975e28db76a4dc52e31 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Fri, 16 Aug 2013 07:42:55 +0000
Subject: Switch to use libnotify07.

Bump PKGREVISION.
---
 x11/xfce4-settings/Makefile                               |  6 +++---
 x11/xfce4-settings/distinfo                               |  3 ++-
 .../patches/patch-xfce4-settings-helper_accessibility.c   | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c

(limited to 'x11')

diff --git a/x11/xfce4-settings/Makefile b/x11/xfce4-settings/Makefile
index 26c7a3a2f8c..63404f98d0f 100644
--- a/x11/xfce4-settings/Makefile
+++ b/x11/xfce4-settings/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2013/06/06 12:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2013/08/16 07:42:55 obache Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=		4.6.5
 
 DISTNAME=		xfce4-settings-${XFCE4_VERSION}
-PKGREVISION=		18
+PKGREVISION=		19
 CATEGORIES=		x11
 COMMENT=		Xfce settings manager
 
@@ -32,7 +32,7 @@ CONF_FILES+=	\
 .include "../../devel/xfconf/buildlink3.mk"
 .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/libX11/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
diff --git a/x11/xfce4-settings/distinfo b/x11/xfce4-settings/distinfo
index c1329617e82..6b6c0549fab 100644
--- a/x11/xfce4-settings/distinfo
+++ b/x11/xfce4-settings/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/09/08 00:22:49 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/08/16 07:42:55 obache Exp $
 
 SHA1 (xfce4-settings-4.6.5.tar.bz2) = c036cc2f3100a46b2649e678dff7c0106b219263
 RMD160 (xfce4-settings-4.6.5.tar.bz2) = a8155346285921f3087795598989df287be8abb4
@@ -6,3 +6,4 @@ Size (xfce4-settings-4.6.5.tar.bz2) = 522389 bytes
 SHA1 (patch-aa) = 104e459ab5b7bd4ac821cacada43f2aa4da23f10
 SHA1 (patch-ab) = 4f23e05cacd765b5be2e101dec29d3c6f5cd839f
 SHA1 (patch-dialogs-keyboard-settings-xfce-keyboard-settings.c) = e011c194084458c65a7f47e27fc03cb8927287b2
+SHA1 (patch-xfce4-settings-helper_accessibility.c) = 190883186f2773ab914ef6be38d387f7aa96e9e4
diff --git a/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c b/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c
new file mode 100644
index 00000000000..f4c193266d3
--- /dev/null
+++ b/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-xfce4-settings-helper_accessibility.c,v 1.1 2013/08/16 07:42:55 obache Exp $
+
+* for libnotify-0.7 API change
+
+--- xfce4-settings-helper/accessibility.c.orig	2010-05-21 17:05:32.000000000 +0000
++++ xfce4-settings-helper/accessibility.c
+@@ -417,7 +417,7 @@ xfce_accessibility_helper_notification_s
+     if (helper->notification == NULL)
+     {
+         /* create a new notification */
+-        helper->notification = notify_notification_new (summary, body, "keyboard", NULL);
++        helper->notification = notify_notification_new (summary, body, "keyboard");
+ 
+         /* close signal */
+         g_signal_connect (G_OBJECT (helper->notification), "closed", G_CALLBACK (xfce_accessibility_helper_notification_closed), helper);
-- 
cgit v1.2.3