Fri Aug 16 07:42:55 2013 UTC ()
Switch to use libnotify07.

Bump PKGREVISION.


(obache)
diff -r1.24 -r1.25 pkgsrc/x11/xfce4-settings/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/xfce4-settings/distinfo
diff -r0 -r1.1 pkgsrc/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c
cvs diff -r1.24 -r1.25 pkgsrc/x11/xfce4-settings/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-settings/Makefile 2013/06/06 12:55:23 1.24
+++ pkgsrc/x11/xfce4-settings/Makefile 2013/08/16 07:42:55 1.25
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.24 2013/06/06 12:55:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2013/08/16 07:42:55 obache Exp $
2 2
3.include "../../meta-pkgs/xfce4/Makefile.common" 3.include "../../meta-pkgs/xfce4/Makefile.common"
4 4
5XFCE4_VERSION= 4.6.5 5XFCE4_VERSION= 4.6.5
6 6
7DISTNAME= xfce4-settings-${XFCE4_VERSION} 7DISTNAME= xfce4-settings-${XFCE4_VERSION}
8PKGREVISION= 18 8PKGREVISION= 19
9CATEGORIES= x11 9CATEGORIES= x11
10COMMENT= Xfce settings manager 10COMMENT= Xfce settings manager
11 11
12MASTER_SITES+= http://archive.xfce.org/src/xfce/xfce4-settings/4.6/ 12MASTER_SITES+= http://archive.xfce.org/src/xfce/xfce4-settings/4.6/
13 13
14BUILD_DEFS+= PKG_SYSCONFBASE 14BUILD_DEFS+= PKG_SYSCONFBASE
15 15
16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
17 17
18EGDIR= ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml 18EGDIR= ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml
19PKG_SYSCONFSUBDIR= xdg 19PKG_SYSCONFSUBDIR= xdg
20 20
21MAKE_DIRS+= ${XFCE4_EGBASE:Q} ${XFCE4_EGBASE:Q}/xfconf ${EGDIR} 21MAKE_DIRS+= ${XFCE4_EGBASE:Q} ${XFCE4_EGBASE:Q}/xfconf ${EGDIR}
22 22
23CONF_FILES= ${EGDIR}/xsettings.xml \ 23CONF_FILES= ${EGDIR}/xsettings.xml \
24 ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml 24 ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
25 25
26CONF_FILES+= \ 26CONF_FILES+= \
27 ${XFCE4_EGBASE:Q}/autostart/xfce4-settings-helper-autostart.desktop \ 27 ${XFCE4_EGBASE:Q}/autostart/xfce4-settings-helper-autostart.desktop \
28 ${PKG_SYSCONFDIR}/autostart/xfce4-settings-helper-autostart.desktop 28 ${PKG_SYSCONFDIR}/autostart/xfce4-settings-helper-autostart.desktop
29 29
30.include "../../devel/libglade/buildlink3.mk" 30.include "../../devel/libglade/buildlink3.mk"
31.include "../../devel/libwnck/buildlink3.mk" 31.include "../../devel/libwnck/buildlink3.mk"
32.include "../../devel/xfconf/buildlink3.mk" 32.include "../../devel/xfconf/buildlink3.mk"
33.include "../../sysutils/dbus-glib/buildlink3.mk" 33.include "../../sysutils/dbus-glib/buildlink3.mk"
34.include "../../sysutils/desktop-file-utils/desktopdb.mk" 34.include "../../sysutils/desktop-file-utils/desktopdb.mk"
35.include "../../sysutils/libnotify/buildlink3.mk" 35.include "../../sysutils/libnotify07/buildlink3.mk"
36.include "../../x11/libX11/buildlink3.mk" 36.include "../../x11/libX11/buildlink3.mk"
37.include "../../x11/libXcursor/buildlink3.mk" 37.include "../../x11/libXcursor/buildlink3.mk"
38.include "../../x11/libXi/buildlink3.mk" 38.include "../../x11/libXi/buildlink3.mk"
39.include "../../x11/libXrandr/buildlink3.mk" 39.include "../../x11/libXrandr/buildlink3.mk"
40.include "../../x11/libxfce4gui/buildlink3.mk" 40.include "../../x11/libxfce4gui/buildlink3.mk"
41.include "../../x11/libxfce4util/buildlink3.mk" 41.include "../../x11/libxfce4util/buildlink3.mk"
42.include "../../x11/libxklavier/buildlink3.mk" 42.include "../../x11/libxklavier/buildlink3.mk"
43.include "../../x11/xfce4-exo/buildlink3.mk" 43.include "../../x11/xfce4-exo/buildlink3.mk"
44.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/x11/xfce4-settings/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-settings/distinfo 2011/09/08 00:22:49 1.4
+++ pkgsrc/x11/xfce4-settings/distinfo 2013/08/16 07:42:55 1.5
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.4 2011/09/08 00:22:49 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2013/08/16 07:42:55 obache Exp $
2 2
3SHA1 (xfce4-settings-4.6.5.tar.bz2) = c036cc2f3100a46b2649e678dff7c0106b219263 3SHA1 (xfce4-settings-4.6.5.tar.bz2) = c036cc2f3100a46b2649e678dff7c0106b219263
4RMD160 (xfce4-settings-4.6.5.tar.bz2) = a8155346285921f3087795598989df287be8abb4 4RMD160 (xfce4-settings-4.6.5.tar.bz2) = a8155346285921f3087795598989df287be8abb4
5Size (xfce4-settings-4.6.5.tar.bz2) = 522389 bytes 5Size (xfce4-settings-4.6.5.tar.bz2) = 522389 bytes
6SHA1 (patch-aa) = 104e459ab5b7bd4ac821cacada43f2aa4da23f10 6SHA1 (patch-aa) = 104e459ab5b7bd4ac821cacada43f2aa4da23f10
7SHA1 (patch-ab) = 4f23e05cacd765b5be2e101dec29d3c6f5cd839f 7SHA1 (patch-ab) = 4f23e05cacd765b5be2e101dec29d3c6f5cd839f
8SHA1 (patch-dialogs-keyboard-settings-xfce-keyboard-settings.c) = e011c194084458c65a7f47e27fc03cb8927287b2 8SHA1 (patch-dialogs-keyboard-settings-xfce-keyboard-settings.c) = e011c194084458c65a7f47e27fc03cb8927287b2
 9SHA1 (patch-xfce4-settings-helper_accessibility.c) = 190883186f2773ab914ef6be38d387f7aa96e9e4
File Added: pkgsrc/x11/xfce4-settings/patches/Attic/patch-xfce4-settings-helper_accessibility.c
$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);