9 files changed, 253 insertions, 230 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 5054530846ae..7f4a68d73e8f 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,56 +1,82 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.75 2011/04/25 19:56:57 mezz Exp $
+#   $MCom: ports/trunk/sysutils/gnome-settings-daemon/Makefile 20031 2014-11-02 21:47:55Z kwm $
 
 PORTNAME=	gnome-settings-daemon
-PORTVERSION=	2.32.1
-PORTREVISION=	6
+PORTVERSION=	3.14.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 settings daemon
+COMMENT=	GNOME 3 settings daemon
 
-LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
+BUILD_DEPENDS=	gnome-session>=0:${PORTSDIR}/x11/gnome-session \
+		geoclue>=0:${PORTSDIR}/net/geoclue \
+		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
+		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
+		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
+		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
+		libdbus-1.so:${PORTSDIR}/devel/dbus \
+		libcolord.so:${PORTSDIR}/graphics/colord \
+		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio \
 		libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libnss3.so:${PORTSDIR}/security/nss
-RUN_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
-
-CONFLICTS=	gnome-settings-daemon-3.[0-9]*
+		libnotify.so:${PORTSDIR}/devel/libnotify \
+		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
+		libgweather-3.so:${PORTSDIR}/net/libgweather
+RUN_DEPENDS=	gnome-session>=0:${PORTSDIR}/x11/gnome-session \
+		geoclue>=0:${PORTSDIR}/net/geoclue \
+		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 USE_XORG=	xxf86misc
-USE_GNOME=	gnomeprefix intlhack gnomedesktop libgnomekbd
-USE_GSTREAMER=	good
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USE_GNOME=	gnomedesktop3 gnomeprefix intlhack libxslt
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
+CONFIGURE_ARGS=	--disable-gudev \
+		--disable-systemd \
+		--disable-rfkill \
+		--disable-network-manager \
+		--disable-packagekit
+#		--disable-ibus \
+#--with-pnpids=${LOCALBASE}/share/libgnome-desktop-3.0/pnp.ids
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	PULSEAUDIO
-OPTIONS_DEFAULT=PULSEAUDIO
-
-GCONF_SCHEMAS=	apps_gnome_settings_daemon_housekeeping.schemas \
-		apps_gnome_settings_daemon_keybindings.schemas \
-		apps_gnome_settings_daemon_xrandr.schemas \
-		desktop_gnome_font_rendering.schemas \
-		desktop_gnome_keybindings.schemas \
-		desktop_gnome_peripherals_smartcard.schemas \
-		desktop_gnome_peripherals_touchpad.schemas \
-		gnome-settings-daemon.schemas
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=--enable-pulse
-PLIST_SUB+=	PULSEAUDIO=""
-.else
-CONFIGURE_ARGS+=--disable-pulse
-PLIST_SUB+=	PULSEAUDIO="@comment "
-.endif
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	CUPS SMARTCARD
+OPTIONS_DEFAULT=CUPS SMARTCARD
+SMARTCARD_DESC=	Smartcard support
+CUPS_CONFIGURE_ENABLE=	cups
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+SMARTCARD_CONFIGURE_ENABLE=	smartcard-support
+SMARTCARD_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+
+GLIB_SCHEMAS=	org.gnome.settings-daemon.enums.xml \
+		org.gnome.settings-daemon.peripherals.gschema.xml \
+		org.gnome.settings-daemon.plugins.color.gschema.xml \
+		org.gnome.settings-daemon.plugins.datetime.gschema.xml \
+		org.gnome.settings-daemon.plugins.gschema.xml \
+		org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
+		org.gnome.settings-daemon.plugins.keyboard.gschema.xml \
+		org.gnome.settings-daemon.plugins.media-keys.gschema.xml \
+		org.gnome.settings-daemon.plugins.power.gschema.xml \
+		org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
+		org.gnome.settings-daemon.plugins.sharing.gschema.xml \
+		org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
+		org.gnome.settings-daemon.plugins.xsettings.gschema.xml
+# work around missing cursor with xorg-server 1.12.
+GLIB_SCHEMAS+=	cursor-plugin.gschema.override
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \
+		${WRKSRC}/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/cursor-plugin.gschema.override \
+		${STAGEDIR}${PREFIX}/share/glib-2.0/schemas
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 4720b385e071..3834b0ce8b2e 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
-SIZE (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 1331850
+SHA256 (gnome3/gnome-settings-daemon-3.14.1.tar.xz) = 1bcca93d9dab5d5a98d0fdfcd1730d334b12158b06d352070537e418f2d98f96
+SIZE (gnome3/gnome-settings-daemon-3.14.1.tar.xz) = 1606848
diff --git a/sysutils/gnome-settings-daemon/files/cursor-plugin.gschema.override b/sysutils/gnome-settings-daemon/files/cursor-plugin.gschema.override
new file mode 100644
index 000000000000..d1c1fdf7dbd5
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/cursor-plugin.gschema.override
@@ -0,0 +1,3 @@
+# disable cursor plugin. It makes the cursor disappear with xorg-server 1.12
+[org.gnome.settings-daemon.plugins.cursor]
+active=false
diff --git a/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in b/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in
new file mode 100644
index 000000000000..62deab5d0b2a
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in
@@ -0,0 +1,50 @@
+--- data/Makefile.in.orig	2014-10-16 07:58:46.261475320 +0200
++++ data/Makefile.in	2014-10-16 08:00:53.638467450 +0200
+@@ -91,10 +91,8 @@
+ 	$(srcdir)/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in \
+ 	$(srcdir)/org.gnome.settings-daemon.peripherals.gschema.xml.in.in \
+ 	$(srcdir)/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in \
+-	$(srcdir)/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in \
+ 	$(srcdir)/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in \
+ 	$(srcdir)/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in \
+-	$(srcdir)/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in \
+ 	$(srcdir)/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+@@ -114,10 +112,8 @@
+ 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in \
+ 	org.gnome.settings-daemon.peripherals.gschema.xml.in \
+ 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in \
+-	org.gnome.settings-daemon.plugins.orientation.gschema.xml.in \
+ 	org.gnome.settings-daemon.plugins.sharing.gschema.xml.in \
+ 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in \
+-	org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in \
+ 	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in
+ CONFIG_CLEAN_VPATH_FILES =
+ AM_V_P = $(am__v_P_@AM_V@)
+@@ -414,9 +410,7 @@
+ 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
+ 	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml	\
+-	org.gnome.settings-daemon.plugins.xrandr.gschema.xml		\
+-	org.gnome.settings-daemon.plugins.orientation.gschema.xml	\
+-	org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
+ 
+ convertdir = $(datadir)/GConf/gsettings
+ convert_DATA = gnome-settings-daemon.convert
+@@ -500,14 +494,10 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-org.gnome.settings-daemon.plugins.orientation.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ org.gnome.settings-daemon.plugins.sharing.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ 
diff --git a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in
new file mode 100644
index 000000000000..15a841b75ee8
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -0,0 +1,15 @@
+--- data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.orig	2014-09-22 18:02:18.000000000 +0200
++++ data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2014-10-16 08:02:07.945478208 +0200
+@@ -15,12 +15,10 @@
+     <child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
+     <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
+     <child name="datetime" schema="org.gnome.settings-daemon.plugins.datetime"/>
+-    <child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/>
+     <child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
+     <child name="keyboard" schema="org.gnome.settings-daemon.plugins.keyboard"/>
+     <child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/>
+     <child name="mouse" schema="org.gnome.settings-daemon.plugins.mouse"/>
+-    <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/>
+     <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
+     <child name="print-notifications" schema="org.gnome.settings-daemon.plugins.print-notifications"/>
+     <child name="screensaver-proxy" schema="org.gnome.settings-daemon.plugins.screensaver-proxy"/>
diff --git a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.power.gschema.xml.in.in b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
new file mode 100644
index 000000000000..70f064a773c8
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
@@ -0,0 +1,35 @@
+--- data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.orig	2014-03-04 16:15:04.000000000 +0000
++++ data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in	2014-03-14 00:09:44.592409466 +0000
+@@ -26,7 +26,7 @@
+       <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
+     </key>
+     <key name="sleep-inactive-ac-type" enum="org.gnome.settings-daemon.GsdPowerActionType">
+-      <default>'suspend'</default>
++      <default>'nothing'</default>
+       <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
+       <description>The type of sleeping that should be performed when the computer is inactive.</description>
+     </key>
+@@ -36,12 +36,12 @@
+       <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
+     </key>
+     <key name="sleep-inactive-battery-type" enum="org.gnome.settings-daemon.GsdPowerActionType">
+-      <default>'suspend'</default>
++      <default>'nothing'</default>
+       <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
+       <description>The type of sleeping that should be performed when the computer is inactive.</description>
+     </key>
+     <key name="button-suspend" enum="org.gnome.settings-daemon.GsdPowerActionType">
+-      <default>'suspend'</default>
++      <default>'nothing'</default>
+       <summary>Suspend button action</summary>
+       <description>The action to take when the system suspend button is pressed.</description>
+     </key>
+@@ -57,7 +57,7 @@
+     </key>
+     <!-- See https://bugzilla.gnome.org/show_bug.cgi?id=652183 for rationale -->
+     <key name="button-power" enum="org.gnome.settings-daemon.GsdPowerActionType">
+-      <default>'suspend'</default>
++      <default>'nothing'</default>
+       <summary>Power button action</summary>
+       <description>The action to take when the system power button is pressed.</description>
+     </key>
diff --git a/sysutils/gnome-settings-daemon/files/patch-libnotify b/sysutils/gnome-settings-daemon/files/patch-libnotify
deleted file mode 100644
index 1166875bf74b..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-libnotify
+++ /dev/null
@@ -1,58 +0,0 @@
-From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Tue, 12 Oct 2010 03:35:45 +0000
-Subject: Require libnotify 0.6.0
-
----
-diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-index 9ca820a..f5964b9 100644
---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
-         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 (GsdA11yKeyboardManager *manager,
-         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/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
-index 02536a3..ef57d5b 100644
---- plugins/xrandr/gsd-xrandr-manager.c
-+++ plugins/xrandr/gsd-xrandr-manager.c
-@@ -1084,16 +1084,9 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to
- 
-         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
---
-cgit v0.8.3.4
diff --git a/sysutils/gnome-settings-daemon/pkg-descr b/sysutils/gnome-settings-daemon/pkg-descr
index 9ce205e84f33..0a0423da398d 100644
--- a/sysutils/gnome-settings-daemon/pkg-descr
+++ b/sysutils/gnome-settings-daemon/pkg-descr
@@ -1,3 +1,3 @@
-GNOME 2 settings daemon.
+GNOME 3 settings daemon.
 
 WWW: http://www.gnome.org
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 8db91669bec7..764878d10bc6 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -1,88 +1,90 @@
-etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
 etc/xdg/autostart/gnome-settings-daemon.desktop
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h
-lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.a
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.so
-lib/gnome-settings-daemon-2.0/libbackground.a
-lib/gnome-settings-daemon-2.0/libbackground.so
-lib/gnome-settings-daemon-2.0/libclipboard.a
-lib/gnome-settings-daemon-2.0/libclipboard.so
-lib/gnome-settings-daemon-2.0/libfont.a
-lib/gnome-settings-daemon-2.0/libfont.so
-lib/gnome-settings-daemon-2.0/libhousekeeping.a
-lib/gnome-settings-daemon-2.0/libhousekeeping.so
-lib/gnome-settings-daemon-2.0/libkeybindings.a
-lib/gnome-settings-daemon-2.0/libkeybindings.so
-lib/gnome-settings-daemon-2.0/libkeyboard.a
-lib/gnome-settings-daemon-2.0/libkeyboard.so
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.a
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.so
-lib/gnome-settings-daemon-2.0/libmouse.a
-lib/gnome-settings-daemon-2.0/libmouse.so
-lib/gnome-settings-daemon-2.0/libsmartcard.a
-lib/gnome-settings-daemon-2.0/libsmartcard.so
-lib/gnome-settings-daemon-2.0/libsound.a
-lib/gnome-settings-daemon-2.0/libsound.so
-lib/gnome-settings-daemon-2.0/libtyping-break.a
-lib/gnome-settings-daemon-2.0/libtyping-break.so
-lib/gnome-settings-daemon-2.0/libxrandr.a
-lib/gnome-settings-daemon-2.0/libxrandr.so
-lib/gnome-settings-daemon-2.0/libxrdb.a
-lib/gnome-settings-daemon-2.0/libxrdb.so
-lib/gnome-settings-daemon-2.0/libxsettings.a
-lib/gnome-settings-daemon-2.0/libxsettings.so
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/smartcard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
+include/gnome-settings-daemon-3.0/gnome-settings-daemon/gnome-settings-plugin.h
+include/gnome-settings-daemon-3.0/gnome-settings-daemon/gsd-enums.h
+lib/gnome-settings-daemon-3.0/a11y-keyboard.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/a11y-settings.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/color.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/datetime.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/liba11y-keyboard.a
+lib/gnome-settings-daemon-3.0/liba11y-keyboard.so
+lib/gnome-settings-daemon-3.0/liba11y-settings.a
+lib/gnome-settings-daemon-3.0/liba11y-settings.so
+lib/gnome-settings-daemon-3.0/libclipboard.a
+lib/gnome-settings-daemon-3.0/libclipboard.so
+lib/gnome-settings-daemon-3.0/libcolor.a
+lib/gnome-settings-daemon-3.0/libcolor.so
+lib/gnome-settings-daemon-3.0/libcursor.a
+lib/gnome-settings-daemon-3.0/libcursor.so
+lib/gnome-settings-daemon-3.0/libdatetime.a
+lib/gnome-settings-daemon-3.0/libdatetime.so
+lib/gnome-settings-daemon-3.0/libgsd.a
+lib/gnome-settings-daemon-3.0/libgsd.so
+lib/gnome-settings-daemon-3.0/libhousekeeping.a
+lib/gnome-settings-daemon-3.0/libhousekeeping.so
+lib/gnome-settings-daemon-3.0/libkeyboard.a
+lib/gnome-settings-daemon-3.0/libkeyboard.so
+lib/gnome-settings-daemon-3.0/libmedia-keys.a
+lib/gnome-settings-daemon-3.0/libmedia-keys.so
+lib/gnome-settings-daemon-3.0/libmouse.a
+lib/gnome-settings-daemon-3.0/libmouse.so
+lib/gnome-settings-daemon-3.0/libpower.a
+lib/gnome-settings-daemon-3.0/libpower.so
+%%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.a
+%%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.so
+lib/gnome-settings-daemon-3.0/libscreensaver-proxy.a
+lib/gnome-settings-daemon-3.0/libscreensaver-proxy.so
+lib/gnome-settings-daemon-3.0/libsharing.a
+lib/gnome-settings-daemon-3.0/libsharing.so
+%%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.a
+%%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.so
+lib/gnome-settings-daemon-3.0/libsound.a
+lib/gnome-settings-daemon-3.0/libsound.so
+lib/gnome-settings-daemon-3.0/libxrandr.a
+lib/gnome-settings-daemon-3.0/libxrandr.so
+lib/gnome-settings-daemon-3.0/libxsettings.a
+lib/gnome-settings-daemon-3.0/libxsettings.so
+lib/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/power.gnome-settings-plugin
+%%CUPS%%lib/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/screensaver-proxy.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/sharing.gnome-settings-plugin
+%%SMARTCARD%%lib/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin
 libdata/pkgconfig/gnome-settings-daemon.pc
 libexec/gnome-settings-daemon
-libexec/gsd-datetime-mechanism
+libexec/gnome-settings-daemon-localeexec
 libexec/gsd-locate-pointer
-share/dbus-1/services/org.gnome.SettingsDaemon.service
-share/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
-share/gnome-control-center/keybindings/50-accessibility.xml
-%%DATADIR%%/acme.ui
-%%DATADIR%%/gsd-a11y-preferences-dialog.ui
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-on.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-off.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-on.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
-%%DATADIR%%/modmap-dialog.ui
-%%DATADIR%%/xrdb/Editres.ad
-%%DATADIR%%/xrdb/Emacs.ad
-%%DATADIR%%/xrdb/General.ad
-%%DATADIR%%/xrdb/Motif.ad
-%%DATADIR%%/xrdb/Tk.ad
-%%DATADIR%%/xrdb/Xaw.ad
-share/icons/hicolor/16x16/actions/touchpad-disabled.png
-share/icons/hicolor/16x16/actions/touchpad-enabled.png
+%%CUPS%%libexec/gsd-printer
+libexec/gsd-test-a11y-keyboard
+libexec/gsd-test-a11y-settings
+libexec/gsd-test-input-helper
+libexec/gsd-test-cursor
+libexec/gsd-test-datetime
+libexec/gsd-test-housekeeping
+libexec/gsd-test-keyboard
+libexec/gsd-test-media-keys
+libexec/gsd-test-mouse
+%%CUPS%%libexec/gsd-test-print-notifications
+%%SMARTCARD%%libexec/gsd-test-smartcard
+libexec/gsd-test-sound
+libexec/gsd-test-screensaver-proxy
+libexec/gsd-test-xrandr
+libexec/gsd-test-xsettings
+man/man1/gnome-settings-daemon.1.gz
+share/GConf/gsettings/gnome-settings-daemon.convert
+%%DATADIR%%/datetime/backward
+share/gnome-settings-daemon-3.0/input-device-example.sh
 share/icons/hicolor/16x16/apps/gsd-xrandr.png
-share/icons/hicolor/22x22/actions/touchpad-disabled.png
-share/icons/hicolor/22x22/actions/touchpad-enabled.png
 share/icons/hicolor/22x22/apps/gsd-xrandr.png
-share/icons/hicolor/24x24/actions/touchpad-disabled.png
-share/icons/hicolor/24x24/actions/touchpad-enabled.png
 share/icons/hicolor/24x24/apps/gsd-xrandr.png
-share/icons/hicolor/32x32/actions/touchpad-disabled.png
-share/icons/hicolor/32x32/actions/touchpad-enabled.png
 share/icons/hicolor/32x32/apps/gsd-xrandr.png
-share/icons/hicolor/scalable/actions/touchpad-disabled.svg
-share/icons/hicolor/scalable/actions/touchpad-enabled.svg
 share/icons/hicolor/scalable/apps/gsd-xrandr.svg
 share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
@@ -109,6 +111,7 @@ share/locale/el/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/en@shaw/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/en_CA/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/en_GB/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/eo/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/es/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/et/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/eu/LC_MESSAGES/gnome-settings-daemon.mo
@@ -117,6 +120,7 @@ share/locale/fi/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/fr/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ga/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/gd/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/gu/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/he/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/hi/LC_MESSAGES/gnome-settings-daemon.mo
@@ -127,6 +131,7 @@ share/locale/is/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/it/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ja/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ka/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/km/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/kn/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ko/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo
@@ -163,8 +168,10 @@ share/locale/sr@latin/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/sv/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ta/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/te/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/tg/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/th/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/tr/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/ug/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/uk/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/vi/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/wa/LC_MESSAGES/gnome-settings-daemon.mo
@@ -173,59 +180,4 @@ share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
-share/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
-@dirrm %%DATADIR%%/xrdb
-@dirrm %%DATADIR%%/icons/hicolor/64x64/devices
-@dirrm %%DATADIR%%/icons/hicolor/64x64
-@dirrm %%DATADIR%%/icons/hicolor
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrm lib/gnome-settings-daemon-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@dirrmtry etc/gnome-settings-daemon/xrandr
-@dirrmtry etc/gnome-settings-daemon
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
+share/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy