Fri Nov 14 01:01:51 2008 UTC ()
Install desktop file to share/gnome/autostart, in the hope that this
will cause the daemon to start automatically with a new Gnome session.

Bump PKGREVISION.


(wiz)
diff -r1.7 -r1.8 pkgsrc/sysutils/gnome-settings-daemon/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/gnome-settings-daemon/PLIST
diff -r1.3 -r1.4 pkgsrc/sysutils/gnome-settings-daemon/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/gnome-settings-daemon/patches/patch-ac
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/gnome-settings-daemon/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/Makefile 2008/10/23 11:59:30 1.7
+++ pkgsrc/sysutils/gnome-settings-daemon/Makefile 2008/11/14 01:01:50 1.8
@@ -1,43 +1,44 @@ @@ -1,43 +1,44 @@
1# $NetBSD: Makefile,v 1.7 2008/10/23 11:59:30 gdt Exp $ 1# $NetBSD: Makefile,v 1.8 2008/11/14 01:01:50 wiz Exp $
2# 2#
3 3
4DISTNAME= gnome-settings-daemon-2.24.0 4DISTNAME= gnome-settings-daemon-2.24.0
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.24/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.24/}
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
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= pkg-config intltool gmake msgfmt 18USE_TOOLS+= pkg-config intltool gmake msgfmt
19 19
20CONFLICTS+= gnome-control-center<2.22.0 20CONFLICTS+= gnome-control-center<2.22.0
21 21
22GCONF_SCHEMAS+= gnome-settings-daemon.schemas 22GCONF_SCHEMAS+= gnome-settings-daemon.schemas
23GCONF_SCHEMAS+= desktop_gnome_font_rendering.schemas 23GCONF_SCHEMAS+= desktop_gnome_font_rendering.schemas
24GCONF_SCHEMAS+= apps_gnome_settings_daemon_keybindings.schemas 24GCONF_SCHEMAS+= apps_gnome_settings_daemon_keybindings.schemas
25GCONF_SCHEMAS+= apps_gnome_settings_daemon_screensaver.schemas 25GCONF_SCHEMAS+= apps_gnome_settings_daemon_screensaver.schemas
26GCONF_SCHEMAS+= apps_gnome_settings_daemon_xrandr.schemas 26GCONF_SCHEMAS+= apps_gnome_settings_daemon_xrandr.schemas
27PKGCONFIG_OVERRIDE+= data/gnome-settings-daemon.pc.in 27PKGCONFIG_OVERRIDE+= data/gnome-settings-daemon.pc.in
28 28
29BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=3.3 29BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=3.3
30 30
31.include "../../devel/GConf/schemas.mk" 31.include "../../devel/GConf/schemas.mk"
32.include "../../sysutils/desktop-file-utils/desktopdb.mk" 32.include "../../devel/libglade/buildlink3.mk"
33.include "../../x11/gtk2/buildlink3.mk" 
34.include "../../sysutils/dbus-glib/buildlink3.mk" 
35.include "../../devel/libgnome/buildlink3.mk" 33.include "../../devel/libgnome/buildlink3.mk"
 34.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 35.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 36.include "../../multimedia/gstreamer0.10/buildlink3.mk"
 37.include "../../sysutils/dbus-glib/buildlink3.mk"
 38.include "../../sysutils/desktop-file-utils/desktopdb.mk"
36.include "../../x11/gnome-desktop/buildlink3.mk" 39.include "../../x11/gnome-desktop/buildlink3.mk"
37.include "../../devel/libglade/buildlink3.mk" 40.include "../../x11/gtk2/buildlink3.mk"
38.include "../../x11/libgnomekbd/buildlink3.mk" 41.include "../../x11/libgnomekbd/buildlink3.mk"
39.include "../../x11/libxklavier/buildlink3.mk" 42.include "../../x11/libxklavier/buildlink3.mk"
40.include "../../multimedia/gstreamer0.10/buildlink3.mk" 43
41.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 
42.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 
43.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/gnome-settings-daemon/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/PLIST 2008/10/16 14:40:35 1.2
+++ pkgsrc/sysutils/gnome-settings-daemon/PLIST 2008/11/14 01:01:51 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2008/10/16 14:40:35 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.3 2008/11/14 01:01:51 wiz Exp $
2include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h 2include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
3lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin 3lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
4lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin 4lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
5lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin 5lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
6lib/gnome-settings-daemon-2.0/dummy.gnome-settings-plugin 6lib/gnome-settings-daemon-2.0/dummy.gnome-settings-plugin
7lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin 7lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin
8lib/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin 8lib/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin
9lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin 9lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin
10lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin 10lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin
11lib/gnome-settings-daemon-2.0/liba11y-keyboard.la 11lib/gnome-settings-daemon-2.0/liba11y-keyboard.la
12lib/gnome-settings-daemon-2.0/libbackground.la 12lib/gnome-settings-daemon-2.0/libbackground.la
13lib/gnome-settings-daemon-2.0/libclipboard.la 13lib/gnome-settings-daemon-2.0/libclipboard.la
14lib/gnome-settings-daemon-2.0/libdummy.la 14lib/gnome-settings-daemon-2.0/libdummy.la
@@ -40,26 +40,27 @@ share/gconf/schemas/apps_gnome_settings_ @@ -40,26 +40,27 @@ share/gconf/schemas/apps_gnome_settings_
40share/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas 40share/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas
41share/gconf/schemas/desktop_gnome_font_rendering.schemas 41share/gconf/schemas/desktop_gnome_font_rendering.schemas
42share/gconf/schemas/gnome-settings-daemon.schemas 42share/gconf/schemas/gnome-settings-daemon.schemas
43share/gnome-settings-daemon/acme-eject.png 43share/gnome-settings-daemon/acme-eject.png
44share/gnome-settings-daemon/acme.glade 44share/gnome-settings-daemon/acme.glade
45share/gnome-settings-daemon/gsd-a11y-preferences-dialog.glade 45share/gnome-settings-daemon/gsd-a11y-preferences-dialog.glade
46share/gnome-settings-daemon/modmap-dialog.glade 46share/gnome-settings-daemon/modmap-dialog.glade
47share/gnome-settings-daemon/xrdb/Editres.ad 47share/gnome-settings-daemon/xrdb/Editres.ad
48share/gnome-settings-daemon/xrdb/Emacs.ad 48share/gnome-settings-daemon/xrdb/Emacs.ad
49share/gnome-settings-daemon/xrdb/General.ad 49share/gnome-settings-daemon/xrdb/General.ad
50share/gnome-settings-daemon/xrdb/Motif.ad 50share/gnome-settings-daemon/xrdb/Motif.ad
51share/gnome-settings-daemon/xrdb/Tk.ad 51share/gnome-settings-daemon/xrdb/Tk.ad
52share/gnome-settings-daemon/xrdb/Xaw.ad 52share/gnome-settings-daemon/xrdb/Xaw.ad
 53share/gnome/autostart/gnome-settings-daemon.desktop
53share/icons/hicolor/16x16/apps/gsd-xrandr.png 54share/icons/hicolor/16x16/apps/gsd-xrandr.png
54share/icons/hicolor/22x22/apps/gsd-xrandr.png 55share/icons/hicolor/22x22/apps/gsd-xrandr.png
55share/icons/hicolor/24x24/apps/gsd-xrandr.png 56share/icons/hicolor/24x24/apps/gsd-xrandr.png
56share/icons/hicolor/32x32/apps/gsd-xrandr.png 57share/icons/hicolor/32x32/apps/gsd-xrandr.png
57share/icons/hicolor/scalable/apps/gsd-xrandr.svg 58share/icons/hicolor/scalable/apps/gsd-xrandr.svg
58share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo 59share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
59share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo 60share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
60share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo 61share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo
61share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo 62share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo
62share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo 63share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo
63share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo 64share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo
64share/locale/bg/LC_MESSAGES/gnome-settings-daemon.mo 65share/locale/bg/LC_MESSAGES/gnome-settings-daemon.mo
65share/locale/bn/LC_MESSAGES/gnome-settings-daemon.mo 66share/locale/bn/LC_MESSAGES/gnome-settings-daemon.mo
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/gnome-settings-daemon/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-settings-daemon/distinfo 2008/10/16 14:40:35 1.3
+++ pkgsrc/sysutils/gnome-settings-daemon/distinfo 2008/11/14 01:01:51 1.4
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.3 2008/10/16 14:40:35 drochner Exp $ 1$NetBSD: distinfo,v 1.4 2008/11/14 01:01:51 wiz Exp $
2 2
3SHA1 (gnome-settings-daemon-2.24.0.tar.bz2) = 7d95a7550c465c9a64e4bda64331c92069958bfd 3SHA1 (gnome-settings-daemon-2.24.0.tar.bz2) = 7d95a7550c465c9a64e4bda64331c92069958bfd
4RMD160 (gnome-settings-daemon-2.24.0.tar.bz2) = da517b2a5841ba4044c7ee69f784894f622ec5f3 4RMD160 (gnome-settings-daemon-2.24.0.tar.bz2) = da517b2a5841ba4044c7ee69f784894f622ec5f3
5Size (gnome-settings-daemon-2.24.0.tar.bz2) = 1119609 bytes 5Size (gnome-settings-daemon-2.24.0.tar.bz2) = 1119609 bytes
6SHA1 (patch-aa) = 66ed26db1eb571bdf6bc4640c989e6384d2f99db 6SHA1 (patch-aa) = 66ed26db1eb571bdf6bc4640c989e6384d2f99db
7SHA1 (patch-ab) = 60620de4803cce1afb3276a061de2c833d8ef23b 7SHA1 (patch-ab) = 60620de4803cce1afb3276a061de2c833d8ef23b
 8SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
File Added: pkgsrc/sysutils/gnome-settings-daemon/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2008/11/14 01:01:51 wiz Exp $

--- data/Makefile.in.orig	2008-09-23 09:43:06.000000000 +0000
+++ data/Makefile.in
@@ -270,7 +270,7 @@ schemas_in_files = \
 	$(NULL)
 
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-desktopdir = $(sysconfdir)/xdg/autostart
+desktopdir = $(datadir)/gnome/autostart
 desktop_in_files = gnome-settings-daemon.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 servicedir = $(datadir)/dbus-1/services