Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


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

7 files changed, 94 insertions, 59 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index f8b5981e8..f74abc93e 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,10 +1,9 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/sysutils/gnome-settings-daemon3/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports-experimental/trunk/sysutils/gnome-settings-daemon/Makefile 19545 2014-04-16 12:23:11Z gusi $
 
 PORTNAME=	gnome-settings-daemon
-PORTVERSION=	3.6.3
-PORTREVISION=	1
+PORTVERSION=	3.12.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,7 +11,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 settings daemon
 
-BUILD_DEPENDS=	gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
+BUILD_DEPENDS=	gnome-session>=0:${PORTSDIR}/x11/gnome-session \
+		geoclue>=0:${PORTSDIR}/net/geoclue \
+		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
@@ -22,18 +23,21 @@ LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio \
 		libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
+		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 \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 USE_XORG=	xxf86misc
-USE_XZ=		yes
-USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libgnomekbd gnomehier
-USES=		gettext gmake pathfix pkgconfig
+USE_GNOME=	gnomehier gnomedesktop3 gnomeprefix intlhack
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-gudev \
 		--disable-systemd \
+		--disable-rfkill \
 		--disable-packagekit
 #		--disable-ibus \
 #--with-pnpids=${LOCALBASE}/share/libgnome-desktop-3.0/pnp.ids
@@ -47,6 +51,7 @@ SMARTCARD_DESC=	Smartcard support
 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 \
@@ -55,6 +60,8 @@ GLIB_SCHEMAS=	org.gnome.settings-daemon.enums.xml \
 		org.gnome.settings-daemon.plugins.print-notifications.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
 
 .include <bsd.port.options.mk>
 
@@ -80,6 +87,8 @@ post-patch:
 		${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
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gnome-settings-daemon-3.0/lib*.so
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 21c75dc2a..2e2f9572b 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-settings-daemon-3.6.3.tar.xz) = 606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc
-SIZE (gnome3/gnome-settings-daemon-3.6.3.tar.xz) = 1492024
+SHA256 (gnome3/gnome-settings-daemon-3.12.1.tar.xz) = 639df1fb978c765009d574d0fb892abbf35f1e875ba71e801cb0dd555a15f23c
+SIZE (gnome3/gnome-settings-daemon-3.12.1.tar.xz) = 1633548
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 000000000..d1c1fdf7d
--- /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 000000000..0172aaa11
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in
@@ -0,0 +1,34 @@
+--- data/Makefile.in.orig	2014-03-15 10:38:22.618467723 +0000
++++ data/Makefile.in	2014-03-15 10:39:58.357459569 +0000
+@@ -91,10 +91,7 @@
+ 	$(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.updates.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 +111,7 @@
+ 	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.updates.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@)
+@@ -417,9 +411,6 @@
+ 	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.updates.gschema.xml		\
+-	org.gnome.settings-daemon.plugins.orientation.gschema.xml	\
+-	org.gnome.settings-daemon.peripherals.wacom.gschema.xml
+ 
+ convertdir = $(datadir)/GConf/gsettings
+ convert_DATA = gnome-settings-daemon.convert
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
index c48e45116..cc2af1d1f 100644
--- 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
@@ -1,9 +1,9 @@
---- 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 @@
+--- data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.orig	2014-03-04 16:15:04.000000000 +0000
++++ data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2014-03-14 00:06:02.791034492 +0000
+@@ -15,18 +15,15 @@
      <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="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"/>
@@ -12,6 +12,7 @@
 -    <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"/>
      <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"/>
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
index a3039f2d5..70f064a77 100644
--- 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
@@ -1,7 +1,7 @@
---- data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.orig	2011-04-17 08:34:12.000000000 +0200
-+++ data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in	2011-04-17 09:05:45.000000000 +0200
-@@ -51,7 +51,7 @@
-       <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep.</description>
+--- 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>
@@ -9,8 +9,8 @@
        <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>
-@@ -66,7 +66,7 @@
-       <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep.</description>
+@@ -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>
@@ -18,25 +18,18 @@
        <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>
-@@ -86,18 +86,18 @@
-       <description>The action to take when the system sleep (non-specific type) button is pressed.</description>
-     </key>
-     <key name="button-power" enum="org.gnome.settings-daemon.GsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'shutdown'</default>
-       <summary>Power button action</summary>
-       <description>The action to take when the system power button is pressed.</description>
-     </key>
-     <!-- See http://bugzilla.gnome.org/637473 for rationale -->
-     <key name="lid-close-battery-action" enum="org.gnome.settings-daemon.GsdPowerActionType">
+     <key name="button-suspend" enum="org.gnome.settings-daemon.GsdPowerActionType">
 -      <default>'suspend'</default>
 +      <default>'nothing'</default>
-       <summary>Laptop lid close action on battery</summary>
-       <description>The action to take when the laptop lid is closed and the laptop is on battery power.</description>
+       <summary>Suspend button action</summary>
+       <description>The action to take when the system suspend button is pressed.</description>
+     </key>
+@@ -57,7 +57,7 @@
      </key>
-     <key name="lid-close-ac-action" enum="org.gnome.settings-daemon.GsdPowerActionType">
+     <!-- 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>Laptop lid close action when on AC</summary>
-       <description>The action to take when the laptop lid is closed and the laptop is on AC power.</description>
+       <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/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index e681a8355..b8b7b5a5a 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -1,13 +1,12 @@
-etc/xdg/autostart/gnome-fallback-mount-helper.desktop
 etc/xdg/autostart/gnome-settings-daemon.desktop
 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/background.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
@@ -16,9 +15,6 @@ 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.la
 lib/gnome-settings-daemon-3.0/liba11y-settings.so
-lib/gnome-settings-daemon-3.0/libbackground.a
-lib/gnome-settings-daemon-3.0/libbackground.la
-lib/gnome-settings-daemon-3.0/libbackground.so
 lib/gnome-settings-daemon-3.0/libclipboard.a
 lib/gnome-settings-daemon-3.0/libclipboard.la
 lib/gnome-settings-daemon-3.0/libclipboard.so
@@ -28,6 +24,9 @@ lib/gnome-settings-daemon-3.0/libcolor.so
 lib/gnome-settings-daemon-3.0/libcursor.a
 lib/gnome-settings-daemon-3.0/libcursor.la
 lib/gnome-settings-daemon-3.0/libcursor.so
+lib/gnome-settings-daemon-3.0/libdatetime.a
+lib/gnome-settings-daemon-3.0/libdatetime.la
+lib/gnome-settings-daemon-3.0/libdatetime.so
 lib/gnome-settings-daemon-3.0/libgsd.a
 lib/gnome-settings-daemon-3.0/libgsd.la
 lib/gnome-settings-daemon-3.0/libgsd.so
@@ -49,6 +48,9 @@ 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.la
 %%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.la
+lib/gnome-settings-daemon-3.0/libscreensaver-proxy.so
 %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.a
 %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.la
 %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.so
@@ -65,39 +67,36 @@ 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
 %%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-fallback-mount-helper
 libexec/gnome-settings-daemon
-libexec/gsd-input-sources-switcher
+libexec/gnome-settings-daemon-localeexec
 libexec/gsd-locate-pointer
 %%CUPS%%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-cursor
+libexec/gsd-test-datetime
+libexec/gsd-test-housekeeping
 libexec/gsd-test-keyboard
 libexec/gsd-test-media-keys
 libexec/gsd-test-mouse
-libexec/gsd-test-power
 %%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
 share/dbus-1/services/org.freedesktop.IBus.service
+%%DATADIR%%/datetime/backward
 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
-%%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
 share/icons/hicolor/16x16/apps/gsd-xrandr.png
 share/icons/hicolor/22x22/apps/gsd-xrandr.png
 share/icons/hicolor/24x24/apps/gsd-xrandr.png
@@ -184,6 +183,7 @@ 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
@@ -242,15 +242,10 @@ share/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm %%DATADIR%%/icons/hicolor/64x64/devices
-@dirrm %%DATADIR%%/icons/hicolor/64x64
-@dirrm %%DATADIR%%/icons/hicolor
-@dirrm %%DATADIR%%/icons
 @comment this is done in libcanberra
 @comment @dirrm lib/gnome-settings-daemon-3.0
+@dirrm %%DATADIR%%/datetime
 @dirrm %%DATADIR%%
 @dirrm lib/gnome-settings-daemon-3.0
 @dirrm include/gnome-settings-daemon-3.0/gnome-settings-daemon
 @dirrm include/gnome-settings-daemon-3.0
-@dirrmtry etc/gnome-settings-daemon/xrandr
-@dirrmtry etc/gnome-settings-daemon