Part two of the GNOME 3.6 update.

Submitted by:	Gustau Perez


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18422 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 54 insertions, 174 deletions

diff --git a/sysutils/gnome-settings-daemon3/Makefile b/sysutils/gnome-settings-daemon3/Makefile
index 4934c19b4..7b755efc7 100644
--- a/sysutils/gnome-settings-daemon3/Makefile
+++ b/sysutils/gnome-settings-daemon3/Makefile
@@ -1,9 +1,9 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/sysutils/gnome-settings-daemon3/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#   $MCom: ports/sysutils/gnome-settings-daemon3/Makefile,v 1.33 2012/05/17 17:50:16 kwm Exp $
 
 PORTNAME=	gnome-settings-daemon
-PORTVERSION=	3.4.2
+PORTVERSION=	3.6.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,7 +15,10 @@ BUILD_DEPENDS=	gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
 		polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
+		ibus-1.0:${PORTSDIR}/textproc/ibus \
+		dbus-1:${PORTSDIR}/devel/dbus \
 		colord:${PORTSDIR}/graphics/colord \
+		lcms2:${PORTSDIR}/graphics/lcms \
 		pulse:${PORTSDIR}/audio/pulseaudio \
 		gdbm:${PORTSDIR}/databases/gdbm \
 		notify:${PORTSDIR}/devel/libnotify
@@ -28,19 +31,21 @@ LATEST_LINK=	gnome-settings-daemon3
 USE_XORG=	xxf86misc
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libgnomekbd3	gnomehier
+USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libgnomekbd3 gnomehier
 USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-gudev \
 		--disable-systemd \
 		--disable-packagekit
+#		--disable-ibus \
 #--with-pnpids=${LOCALBASE}/share/libgnome-desktop-3.0/pnp.ids
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	CUPS "Enable cups (printing) support" On \
-		SMARTCARD "Enable smartcard support" On
+OPTIONS_DEFINE=	CUPS SMARTCARD
+OPTIONS_DEFAULT=CUPS SMARTCARD
+SMARTCARD_DESC=	Smartcard support
 
 GLIB_SCHEMAS=	org.gnome.settings-daemon.enums.xml \
 		org.gnome.settings-daemon.peripherals.gschema.xml \
@@ -58,21 +63,21 @@ MAN1=		gnome-settings-daemon.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
+.if ${PORT_OPTIONS:MCUPS}
+LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
 PLIST_SUB+=	CUPS=""
 .else
 PLIST_SUB+=	CUPS="@comment "
 CONFIGURE_ARGS+=--disable-cups
 .endif
 
-.if defined(WITHOUT_SMARTCARD)
-CONFIGURE_ARGS+=--disable-smartcard-support
-PLIST_SUB+=	SMARTCARD="@comment "
-.else
-LIB_DEPENDS+=	nss3.1:${PORTSDIR}/security/nss
+.if ${PORT_OPTIONS:MSMARTCARD}
+LIB_DEPENDS+=	nss3:${PORTSDIR}/security/nss
 CONFIGURE_ARGS+=--enable-smartcard-support
 PLIST_SUB+=	SMARTCARD=""
+.else
+CONFIGURE_ARGS+=--disable-smartcard-support
+PLIST_SUB+=	SMARTCARD="@comment "
 .endif
 
 post-patch:
diff --git a/sysutils/gnome-settings-daemon3/distinfo b/sysutils/gnome-settings-daemon3/distinfo
index 35a5e7d40..21c75dc2a 100644
--- a/sysutils/gnome-settings-daemon3/distinfo
+++ b/sysutils/gnome-settings-daemon3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-settings-daemon-3.4.2.tar.xz) = 00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4
-SIZE (gnome3/gnome-settings-daemon-3.4.2.tar.xz) = 1430872
+SHA256 (gnome3/gnome-settings-daemon-3.6.3.tar.xz) = 606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc
+SIZE (gnome3/gnome-settings-daemon-3.6.3.tar.xz) = 1492024
diff --git a/sysutils/gnome-settings-daemon3/files/patch-configure b/sysutils/gnome-settings-daemon3/files/patch-configure
deleted file mode 100644
index 33634babc..000000000
--- a/sysutils/gnome-settings-daemon3/files/patch-configure
+++ /dev/null
@@ -1,127 +0,0 @@
---- configure.orig	2012-05-17 19:12:52.000000000 +0200
-+++ configure	2012-05-17 19:14:21.000000000 +0200
-@@ -19120,99 +19120,6 @@
- fi
- 
- 
--
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WACOM" >&5
--$as_echo_n "checking for WACOM... " >&6; }
--
--if test -n "$WACOM_CFLAGS"; then
--    pkg_cv_WACOM_CFLAGS="$WACOM_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwacom >= \$LIBWACOM_REQUIRED_VERSION x11 xi xtst \$GUDEV_PKG gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_WACOM_CFLAGS=`$PKG_CONFIG --cflags "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$WACOM_LIBS"; then
--    pkg_cv_WACOM_LIBS="$WACOM_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwacom >= \$LIBWACOM_REQUIRED_VERSION x11 xi xtst \$GUDEV_PKG gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_WACOM_LIBS=`$PKG_CONFIG --libs "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        WACOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>&1`
--        else
--	        WACOM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$WACOM_PKG_ERRORS" >&5
--
--	as_fn_error $? "Package requirements (libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom) were not met:
--
--$WACOM_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables WACOM_CFLAGS
--and WACOM_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details." "$LINENO" 5
--
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables WACOM_CFLAGS
--and WACOM_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
--
--else
--	WACOM_CFLAGS=$pkg_cv_WACOM_CFLAGS
--	WACOM_LIBS=$pkg_cv_WACOM_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--fi
--
--
- have_packagekit=false
- # Check whether --enable-packagekit was given.
- if test "${enable_packagekit+set}" = set; then :
-@@ -20045,7 +19952,7 @@
- fi
- 
- 
--ac_config_files="$ac_config_files Makefile gnome-settings-daemon/Makefile plugins/Makefile plugins/a11y-keyboard/Makefile plugins/a11y-settings/Makefile plugins/automount/Makefile plugins/background/Makefile plugins/clipboard/Makefile plugins/color/Makefile plugins/common/Makefile plugins/cursor/Makefile plugins/dummy/Makefile plugins/power/Makefile plugins/housekeeping/Makefile plugins/keyboard/Makefile plugins/media-keys/Makefile plugins/media-keys/cut-n-paste/Makefile plugins/mouse/Makefile plugins/orientation/Makefile plugins/print-notifications/Makefile plugins/smartcard/Makefile plugins/sound/Makefile plugins/updates/Makefile plugins/wacom/Makefile plugins/xrandr/Makefile plugins/xsettings/Makefile data/Makefile data/gnome-settings-daemon.pc data/gnome-settings-daemon-uninstalled.pc data/org.gnome.settings-daemon.plugins.gschema.xml.in data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in data/org.gnome.settings-daemon.plugins.power.gschema.xml.in data/org.gnome.settings-daemon.plugins.color.gschema.xml.in data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in data/org.gnome.settings-daemon.peripherals.gschema.xml.in data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in po/Makefile.in"
-+ac_config_files="$ac_config_files Makefile gnome-settings-daemon/Makefile plugins/Makefile plugins/a11y-keyboard/Makefile plugins/a11y-settings/Makefile plugins/automount/Makefile plugins/background/Makefile plugins/clipboard/Makefile plugins/color/Makefile plugins/common/Makefile plugins/cursor/Makefile plugins/dummy/Makefile plugins/power/Makefile plugins/housekeeping/Makefile plugins/keyboard/Makefile plugins/media-keys/Makefile plugins/media-keys/cut-n-paste/Makefile plugins/mouse/Makefile plugins/orientation/Makefile plugins/print-notifications/Makefile plugins/smartcard/Makefile plugins/sound/Makefile plugins/updates/Makefile plugins/xrandr/Makefile plugins/xsettings/Makefile data/Makefile data/gnome-settings-daemon.pc data/gnome-settings-daemon-uninstalled.pc data/org.gnome.settings-daemon.plugins.gschema.xml.in data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in data/org.gnome.settings-daemon.plugins.power.gschema.xml.in data/org.gnome.settings-daemon.plugins.color.gschema.xml.in data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in data/org.gnome.settings-daemon.peripherals.gschema.xml.in data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in po/Makefile.in"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -21211,7 +21118,6 @@
-     "plugins/smartcard/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/smartcard/Makefile" ;;
-     "plugins/sound/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sound/Makefile" ;;
-     "plugins/updates/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/updates/Makefile" ;;
--    "plugins/wacom/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/wacom/Makefile" ;;
-     "plugins/xrandr/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/xrandr/Makefile" ;;
-     "plugins/xsettings/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/xsettings/Makefile" ;;
-     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-@@ -21228,7 +21134,6 @@
-     "data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in" ;;
-     "data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in" ;;
-     "data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in" ;;
--    "data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in" ;;
-     "data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in" ;;
-     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
diff --git a/sysutils/gnome-settings-daemon3/files/patch-data_Makefile.in b/sysutils/gnome-settings-daemon3/files/patch-data_Makefile.in
deleted file mode 100644
index 563472492..000000000
--- a/sysutils/gnome-settings-daemon3/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- data/Makefile.in.orig	2012-05-17 19:14:40.000000000 +0200
-+++ data/Makefile.in	2012-05-17 19:15:36.000000000 +0200
-@@ -347,7 +347,6 @@
- 	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.peripherals.wacom.gschema.xml \
- 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
- 	$(am__append_1) $(am__append_3)
- all_schemas = $(gsettings_SCHEMAS) $(am__append_2) $(am__append_4)
diff --git a/sysutils/gnome-settings-daemon3/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in b/sysutils/gnome-settings-daemon3/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in
new file mode 100644
index 000000000..c48e45116
--- /dev/null
+++ b/sysutils/gnome-settings-daemon3/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -0,0 +1,20 @@
+--- data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.orig	2013-04-08 08:40:28.207584852 +0000
++++ data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-08 08:40:35.790584900 +0000
+@@ -7,17 +7,14 @@
+     <child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
+     <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
+     <child name="font" schema="org.gnome.settings-daemon.plugins.font"/>
+-    <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="smartcard" schema="org.gnome.settings-daemon.plugins.smartcard"/>
+     <child name="sound" schema="org.gnome.settings-daemon.plugins.sound"/>
+-    <child name="updates" schema="org.gnome.settings-daemon.plugins.updates"/>
+     <child name="xrandr" schema="org.gnome.settings-daemon.plugins.xrandr"/>
+     <child name="xsettings" schema="org.gnome.settings-daemon.plugins.xsettings"/>
+   </schema>
diff --git a/sysutils/gnome-settings-daemon3/files/patch-gnome-settings-daemon_gnome-settings-module.c b/sysutils/gnome-settings-daemon3/files/patch-gnome-settings-daemon_gnome-settings-module.c
deleted file mode 100644
index 29dd8f4ea..000000000
--- a/sysutils/gnome-settings-daemon3/files/patch-gnome-settings-daemon_gnome-settings-module.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/gnome-settings-module.c.orig	2011-03-28 18:38:07.000000000 -0400
-+++ gnome-settings-daemon/gnome-settings-module.c	2011-03-28 18:31:50.000000000 -0400
-@@ -92,7 +92,7 @@ gnome_settings_module_unload (GTypeModul
- 
-         g_debug ("Unloading %s", module->path);
- 
--        g_module_close (module->library);
-+        /*g_module_close (module->library);*/
- 
-         module->library = NULL;
-         module->type = 0;
diff --git a/sysutils/gnome-settings-daemon3/files/patch-plugins_Makefile.in b/sysutils/gnome-settings-daemon3/files/patch-plugins_Makefile.in
deleted file mode 100644
index b5587982a..000000000
--- a/sysutils/gnome-settings-daemon3/files/patch-plugins_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/Makefile.in.orig	2012-05-17 19:16:15.000000000 +0200
-+++ plugins/Makefile.in	2012-05-17 19:16:25.000000000 +0200
-@@ -314,7 +314,7 @@
- NULL = 
- enabled_plugins = a11y-keyboard a11y-settings automount background \
- 	clipboard color cursor dummy power housekeeping keyboard \
--	media-keys mouse sound wacom xrandr xsettings $(NULL) \
-+	media-keys mouse sound xrandr xsettings $(NULL) \
- 	$(am__append_1) $(am__append_3) $(am__append_5) \
- 	$(am__append_7)
- disabled_plugins = $(NULL) $(am__append_2) $(am__append_4) \
diff --git a/sysutils/gnome-settings-daemon3/pkg-plist b/sysutils/gnome-settings-daemon3/pkg-plist
index a548d9640..3d4e1ba94 100644
--- a/sysutils/gnome-settings-daemon3/pkg-plist
+++ b/sysutils/gnome-settings-daemon3/pkg-plist
@@ -72,10 +72,23 @@ lib/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin
 libdata/pkgconfig/gnome-settings-daemon.pc
 libexec/gnome-fallback-mount-helper
 libexec/gnome-settings-daemon
+libexec/gsd-input-sources-switcher
 libexec/gsd-locate-pointer
 libexec/gsd-printer
+libexec/gsd-test-a11y-keyboard
+libexec/gsd-test-a11y-settings
+libexec/gsd-test-background
+libexec/gsd-test-input-helper
+libexec/gsd-test-keyboard
+libexec/gsd-test-media-keys
+libexec/gsd-test-mouse
+libexec/gsd-test-power
+libexec/gsd-test-print-notifications
+libexec/gsd-test-smartcard
+libexec/gsd-test-sound
+libexec/gsd-test-xsettings
 share/GConf/gsettings/gnome-settings-daemon.convert
-share/dbus-1/services/org.gnome.SettingsDaemon.service
+share/dbus-1/services/org.freedesktop.IBus.service
 share/gnome-settings-daemon-3.0/input-device-example.sh
 %%DATADIR%%/gsd-a11y-preferences-dialog.ui
 %%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png
@@ -133,6 +146,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