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

15 files changed, 94 insertions, 262 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 521dea720..ae4cd8ced 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,9 +1,10 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gdm/Makefile 18858 2013-11-07 19:21:23Z gusi $
+#   $MCom: ports-experimental/trunk/x11/gdm/Makefile 19570 2014-04-25 15:47:33Z gusi $
 
 PORTNAME=	gdm
-PORTVERSION=	3.6.2
+PORTVERSION=	3.12.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -39,20 +40,18 @@ RUN_DEPENDS+=	xrdb:${PORTSDIR}/x11/xrdb \
 USERS=		gdm
 GROUPS=		gdm
 
-USE_XZ=		yes
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
-INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
-USES=		gettext gmake pathfix pkgconfig
-USE_GNOME=	dconf gnomehier gnomeprefix intlhack introspection librsvg2 gnomepanel3
+USES=		gettext gmake pathfix pkgconfig tar:xz
+USE_GNOME=	dconf gnomehier gnomeprefix intlhack introspection librsvg2
 GNU_CONFIGURE=	yes
 GLIB_SCHEMAS=	org.gnome.login-screen.gschema.xml
 CONFIGURE_ARGS=	--disable-static \
 		--mandir=${PREFIX}/man \
-		--with-lang-file=${PREFIX}/etc/gdm/i18n \
+		--with-lang-file=${PREFIX}/etc/gdm/locale.conf \
 		--with-at-spi-registryd-directory=${LOCALBASE}/libexec \
 		--with-custom-conf=${PREFIX}/etc/gdm/custom.conf \
 		--with-dbus-sys=${PREFIX}/etc/dbus-1/system.d \
@@ -76,7 +75,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 SUB_FILES+=	gdm-launch-environment \
 		gdm-password \
 		gdm-autologin \
-		client.conf
+		client.conf \
+		locale.conf
 
 GDMDIR?=	${PREFIX}/etc/gdm
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -127,9 +127,7 @@ post-patch:
 		${WRKSRC}/data/Xsession.in
 	@${RM}	${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
 		${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \
-		${WRKSRC}/data/applications/gnome-mag.desktop \
 		${WRKSRC}/data/applications/gnome-shell.desktop \
-		${WRKSRC}/data/applications/gok.desktop
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
@@ -139,7 +137,6 @@ post-install:
 	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/dm/Sessions
 
 	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/gdm/home
-	${CHOWN} ${USER}:${GROUP} ${STAGEDIR}${PREFIX}/etc/gdm/home
 	${CHMOD} 1770 ${STAGEDIR}${PREFIX}/etc/gdm/home
 	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
 
@@ -149,11 +146,12 @@ post-install:
 
 	${INSTALL_DATA} ${WRKDIR}/client.conf ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
 
+	${INSTALL_DATA} ${WRKDIR}/locale.conf ${STAGEDIR}${PREFIX}/etc/gdm/
+
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
 
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdm*.so.1
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gdm/simple-greeter/extensions/lib*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdm.so.1
 
 # logwtmp lives here.
 .if ${OSVERSION} < 900000
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 0c85c0dcd..56b6c7bf5 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gdm-3.6.2.tar.xz) = fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9
-SIZE (gnome3/gdm-3.6.2.tar.xz) = 1627356
+SHA256 (gnome3/gdm-3.12.1.tar.xz) = 41a009252bf491dadd7644b3e74be5c9364b1971b519a1a9ef31257180c74913
+SIZE (gnome3/gdm-3.12.1.tar.xz) = 1505728
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 002470dc0..d2886f2f7 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -34,6 +34,10 @@ gdm_start()
     fi
     echo "Starting ${name}."
 
+    # we need to remove locking files under $gdm_home/.cache/gnome-shell/
+    # until XDG_RUNTIME_DIR can be set and used
+    rm -fr %%PREFIX%%/etc/gdm/home/.cache/gnome-shell/runtime-state*
+
     # make sure there is no pam configuration for gdm service in base system
     if ! checkyesno gdm_preserve_base_pam_conf && [ -f /etc/pam.d/gdm ]; then
 	cp -p /etc/pam.d/gdm /etc/pam.d/gdm_disabled
diff --git a/x11/gdm/files/locale.conf.in b/x11/gdm/files/locale.conf.in
new file mode 100644
index 000000000..884682f48
--- /dev/null
+++ b/x11/gdm/files/locale.conf.in
@@ -0,0 +1,3 @@
+LANG="en_US.UTF-8"
+LC_CTYPE="en_US.UTF-8"
+LC_MESSAGES="en_US.UTF-8"
diff --git a/x11/gdm/files/patch-common_Makefile.in b/x11/gdm/files/patch-common_Makefile.in
index 22b72966b..87f2cc911 100644
--- a/x11/gdm/files/patch-common_Makefile.in
+++ b/x11/gdm/files/patch-common_Makefile.in
@@ -1,20 +1,10 @@
---- common/Makefile.in.orig	2011-03-11 13:17:04.000000000 +0100
-+++ common/Makefile.in	2011-03-11 13:18:02.000000000 +0100
-@@ -463,7 +463,8 @@
- 	-DLOCALSTATEDIR=\"$(localstatedir)\"	\
- 	$(NULL)
- 
--gdm_crash_logger_LDADD = $(GTHREAD_LIBS)
-+gdm_crash_logger_LDADD = $(GTHREAD_LIBS) \
-+			-lexecinfo
- @MKDTEMP_MISSING_FALSE@MKDTEMP_FILES = 
- @MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h
- libgdmcommon_la_SOURCES = \
-@@ -511,6 +512,7 @@
+--- common/Makefile.in.orig	2014-03-21 08:15:10.657611891 +0000
++++ common/Makefile.in	2014-03-21 08:17:08.641605278 +0000
+@@ -548,6 +548,7 @@
  	$(NULL)
  
  libgdmcommon_la_LIBADD = \
-+	-lexecinfo \
++	-lexecinfo		\
+ 	$(SYSTEMD_LIBS)	        \
  	$(NULL)
  
- libgdmcommon_la_LDFLAGS = \
diff --git a/x11/gdm/files/patch-daemon_gdm-session.c b/x11/gdm/files/patch-daemon_gdm-session.c
deleted file mode 100644
index 7754a34fc..000000000
--- a/x11/gdm/files/patch-daemon_gdm-session.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- daemon/gdm-session.c
-+++ daemon/gdm-session.c
-@@ -970,28 +970,6 @@ allow_worker_function (GDBusAuthObserver *observer,
-         return FALSE;
- }
- 
--static GPid
--credentials_get_unix_pid (GCredentials *credentials)
--{
--        GPid pid = 0;
--        gpointer native_credentials = NULL;
--
--#ifdef __linux__
--        native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
--        pid = (GPid) ((struct ucred *) native_credentials)->pid;
--#elif defined (__FreeBSD__)
--        native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
--        pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
--#elif defined (__OpenBSD__)
--        native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
--        pid = (GPid) ((struct sockpeercred *) native_credentials)->pid;
--#else
--#error "platform not supported, need mechanism to detect pid of connected process"
--#endif
--
--        return pid;
--}
--
- static gboolean
- register_worker (GdmDBusWorkerManager  *worker_manager_interface,
-                  GDBusMethodInvocation *invocation,
-@@ -1021,7 +999,7 @@ register_worker (GdmDBusWorkerManager  *worker_manager_interface,
-                                     connection_node);
- 
-         credentials = g_dbus_connection_get_peer_credentials (connection);
--        pid = credentials_get_unix_pid (credentials);
-+        pid = g_credentials_get_unix_pid (credentials, NULL);
- 
-         conversation = find_conversation_by_pid (self, (GPid) pid);
- 
-@@ -1479,7 +1457,7 @@ on_outside_connection_closed (GDBusConnection *connection,
-                             connection);
- 
-         credentials = g_dbus_connection_get_peer_credentials (connection);
--        pid_of_client = credentials_get_unix_pid (credentials);
-+        pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
- 
-         g_signal_emit (G_OBJECT (self),
-                        signals [CLIENT_DISCONNECTED],
-@@ -1531,7 +1509,7 @@ handle_connection_from_outside (GDBusServer      *server,
-         }
- 
-         credentials = g_dbus_connection_get_peer_credentials (connection);
--        pid_of_client = credentials_get_unix_pid (credentials);
-+        pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
- 
-         g_signal_emit (G_OBJECT (self),
-                        signals [CLIENT_CONNECTED],
diff --git a/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c
index b6e79c441..2d5aa39d1 100644
--- a/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c
+++ b/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c
@@ -1,14 +1,6 @@
---- daemon/gdm-xdmcp-display-factory.c.orig	2011-02-18 04:27:53.000000000 +0100
-+++ daemon/gdm-xdmcp-display-factory.c	2011-03-11 13:14:10.000000000 +0100
-@@ -35,6 +35,7 @@
- #include <netdb.h>
- #include <arpa/inet.h>
- #include <net/if.h>
-+#include <netinet/in.h>
- #ifdef HAVE_SYS_SOCKIO_H
- #include <sys/sockio.h>
- #endif
-@@ -76,7 +77,7 @@ int deny_severity = LOG_WARNING;
+--- daemon/gdm-xdmcp-display-factory.c.orig	2014-03-21 08:21:57.405582553 +0000
++++ daemon/gdm-xdmcp-display-factory.c	2014-03-21 08:22:13.029582593 +0000
+@@ -77,7 +77,7 @@
  #define DEFAULT_USE_MULTICAST         FALSE
  #define DEFAULT_MULTICAST_ADDRESS     "ff02::1"
  #define DEFAULT_HONOR_INDIRECT        TRUE
diff --git a/x11/gdm/files/patch-data_00-upstream-settings b/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
index 2ef8da4ea..0000c8b0d 100644
--- a/x11/gdm/files/patch-data_00-upstream-settings
+++ b/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
@@ -1,5 +1,5 @@
---- data/00-upstream-settings.orig	2013-08-26 09:40:51.130280797 +0000
-+++ data/00-upstream-settings	2013-08-26 09:41:19.482277022 +0000
+--- data/dconf/defaults/00-upstream-settings.orig	2014-03-21 08:45:14.698486081 +0000
++++ data/dconf/defaults/00-upstream-settings	2014-03-21 08:45:23.489485407 +0000
 @@ -13,7 +13,7 @@
  show-desktop-icons=false
  
diff --git a/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam b/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
deleted file mode 100644
index 61737fae0..000000000
--- a/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
+++ /dev/null
@@ -1,30 +0,0 @@
---- data/pam-redhat/gdm-password.pam.orig	2012-10-03 22:03:41.000000000 +0000
-+++ data/pam-redhat/gdm-password.pam	2013-05-02 09:48:30.000000000 +0000
-@@ -1,20 +1,10 @@
--auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
--auth        substack      password-auth
--auth        optional      pam_gnome_keyring.so
--auth        include       postlogin
-+auth        required      pam_unix.so
-+auth        optional      %%LOCALBASE%%/lib/pam_gnome_keyring.so
- 
--account     required      pam_nologin.so
--account     include       password-auth
-+account     required      pam_unix.so
- 
--password    include       password-auth
-+password    required      pam_unix.so
-+
-+session     include      system
-+session     optional     %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
- 
--session     required      pam_selinux.so close
--session     required      pam_loginuid.so
--session     optional      pam_console.so
---session    optional    pam_ck_connector.so
--session     required      pam_selinux.so open
--session     optional      pam_keyinit.so force revoke
--session     required      pam_namespace.so
--session     include       password-auth
--session     optional      pam_gnome_keyring.so auto_start
--session     include       postlogin
diff --git a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
deleted file mode 100644
index e8a958e66..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/simple-greeter/Makefile.in.orig	2008-02-13 01:57:37.000000000 -0500
-+++ gui/simple-greeter/Makefile.in	2008-02-13 01:57:44.000000000 -0500
-@@ -445,7 +445,7 @@ INCLUDES = \
- 	-DGDMCONFDIR=\"$(gdmconfdir)\"                  \
- 	-DDATADIR=\""$(datadir)"\"		 	\
- 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
--	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"	\
-+	-DLIBLOCALEDIR=\""/usr/share/locale"\"	\
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
- 	-DGLADEDIR=\""$(pkgdatadir)"\" 	\
- 	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
diff --git a/x11/gdm/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c b/x11/gdm/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c
deleted file mode 100644
index 51b0d5492..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_extensions_smartcard_gdm-smartcard-worker.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c.orig	2011-09-22 17:50:06.000000000 +0200
-+++ gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c	2011-09-22 17:51:09.000000000 +0200
-@@ -2,7 +2,9 @@
- 
- #include <fcntl.h>
- #include <locale.h>
-+#ifdef __linux__
- #include <sys/prctl.h>
-+#endif
- #include <stdlib.h>
- #include <unistd.h>
- 
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c
deleted file mode 100644
index 059d72cf4..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gui/simple-greeter/gdm-remote-login-window.c.orig	2008-03-24 11:27:13.000000000 +0100
-+++ gui/simple-greeter/gdm-remote-login-window.c	2008-03-24 11:27:31.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/signal.h>
- #include <errno.h>
- 
- #include <glib.h>
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index 37267b2e2..9c3cae518 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -22,8 +22,6 @@ POST-INSTALL)
 	${CHOWN} root:${GROUP} /var/cache/gdm
 	${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
 	${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
-	#${MKDIR} ${PKG_PREFIX}/etc/gdm/home/.config
-	${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.config
 	gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset /
 	${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
 	${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
@@ -31,6 +29,9 @@ POST-INSTALL)
 
 	${MKDIR} -p ${PKG_PREFIX}/etc/gdm/Sessions
 	${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
+
+	${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home
+
 	exit 0
 	;;
 esac
diff --git a/x11/gdm/pkg-message b/x11/gdm/pkg-message
index b6567dce0..d5ee5518c 100644
--- a/x11/gdm/pkg-message
+++ b/x11/gdm/pkg-message
@@ -19,4 +19,4 @@ unlocked if:
 	....
 	session		optional	${LOCALBASE}/lib/pam_gnome_keyring.so auto_start
 
-It is recommended to put thouse directives at least after the system directives.
+It is recommended to put those directives after the system directives.
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index a9509d76a..0944f40ef 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -1,18 +1,14 @@
 bin/gdm-screenshot
 bin/gdmflexiserver
 etc/dbus-1/system.d/gdm.conf
-etc/dconf/db/gdm.d/00-upstream-settings
-etc/dconf/db/gdm.d/locks/00-upstream-settings-locks
-etc/dconf/profile/gdm
-@unexec /bin/rm -f %D/etc/dconf/db/gdm
+etc/gdm/Xsession
+etc/gdm/custom.conf
+etc/gdm/custom.conf.default
+etc/gdm/locale.conf
 etc/gdm/Init/Default
 etc/gdm/PostLogin/Default.sample
 etc/gdm/PostSession/Default
 etc/gdm/PreSession/Default
-etc/gdm/Xsession
-@unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
-etc/gdm/custom.conf.default
-@exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
 etc/gdm/home/.pulse/client.conf
 etc/pam.d/gdm-autologin
 etc/pam.d/gdm-launch-environment
@@ -21,50 +17,28 @@ include/gdm/gdm-client-glue.h
 include/gdm/gdm-client.h
 include/gdm/gdm-sessions.h
 include/gdm/gdm-user-switching.h
-include/gdm/simple-greeter/gdm-login-extension.h
-lib/gdm/simple-greeter/extensions/libfingerprint.la
-lib/gdm/simple-greeter/extensions/libfingerprint.so
-lib/gdm/simple-greeter/extensions/libpassword.la
-lib/gdm/simple-greeter/extensions/libpassword.so
-lib/gdm/simple-greeter/extensions/libsmartcard.la
-lib/gdm/simple-greeter/extensions/libsmartcard.so
-lib/girepository-1.0/Gdm-1.0.typelib
 lib/libgdm.la
 lib/libgdm.so
 lib/libgdm.so.1
-lib/libgdmsimplegreeter.la
-lib/libgdmsimplegreeter.so
-lib/libgdmsimplegreeter.so.1
+lib/girepository-1.0/Gdm-1.0.typelib
 libdata/pkgconfig/gdm.pc
-libdata/pkgconfig/gdmsimplegreeter.pc
-libexec/gdm-crash-logger
 libexec/gdm-host-chooser
 libexec/gdm-session-worker
 libexec/gdm-simple-chooser
-libexec/gdm-simple-greeter
-libexec/gdm-simple-slave
-libexec/gdm-smartcard-worker
-libexec/gdm-xdmcp-chooser-slave
 sbin/gdm
-sbin/gdm-binary
+share/dconf/profile/gdm
+share/gir-1.0/Gdm-1.0.gir
 %%DATADIR%%/gdb-cmd
-%%DATADIR%%/gdm-greeter-login-window.ui
 %%DATADIR%%/gdm.schemas
+%%DATADIR%%/greeter/autostart/caribou-autostart.desktop
+%%DATADIR%%/greeter-dconf-defaults
 %%DATADIR%%/greeter/applications/gdm-simple-greeter.desktop
-%%DATADIR%%/greeter/applications/gnome-mag.desktop
 %%DATADIR%%/greeter/applications/gnome-shell.desktop
-%%DATADIR%%/greeter/applications/gok.desktop
 %%DATADIR%%/greeter/applications/mime-dummy-handler.desktop
 %%DATADIR%%/greeter/applications/mimeapps.list
 %%DATADIR%%/greeter/applications/polkit-gnome-authentication-agent-1.desktop
 %%DATADIR%%/greeter/autostart/orca-autostart.desktop
 %%DATADIR%%/locale.alias
-%%DATADIR%%/simple-greeter/extensions/fingerprint/page.ui
-%%DATADIR%%/simple-greeter/extensions/password/page.ui
-%%DATADIR%%/simple-greeter/extensions/smartcard/page.ui
-%%DATADIR%%/simple-greeter/extensions/unified/page.ui
-share/gir-1.0/Gdm-1.0.gir
-share/gnome-session/sessions/gdm-fallback.session
 share/gnome-session/sessions/gdm-shell.session
 share/help/C/gdm/index.docbook
 share/help/C/gdm/legal.xml
@@ -90,6 +64,8 @@ share/help/ko/gdm/index.docbook
 share/help/ko/gdm/legal.xml
 share/help/oc/gdm/index.docbook
 share/help/oc/gdm/legal.xml
+share/help/pt_BR/gdm/index.docbook
+share/help/pt_BR/gdm/legal.xml
 share/help/ru/gdm/index.docbook
 share/help/ru/gdm/legal.xml
 share/help/sl/gdm/index.docbook
@@ -102,13 +78,9 @@ share/help/uk/gdm/index.docbook
 share/help/uk/gdm/legal.xml
 share/help/zh_CN/gdm/index.docbook
 share/help/zh_CN/gdm/legal.xml
-share/icons/hicolor/16x16/apps/gdm-fingerprint.png
-share/icons/hicolor/16x16/apps/gdm-smartcard.png
 share/icons/hicolor/16x16/apps/gdm-xnest.png
 share/icons/hicolor/32x32/apps/gdm-setup.png
 share/icons/hicolor/32x32/apps/gdm-xnest.png
-share/icons/hicolor/48x48/apps/gdm-fingerprint.png
-share/icons/hicolor/48x48/apps/gdm-smartcard.png
 share/locale/af/LC_MESSAGES/gdm.mo
 share/locale/am/LC_MESSAGES/gdm.mo
 share/locale/an/LC_MESSAGES/gdm.mo
@@ -200,6 +172,7 @@ share/locale/sr@latin/LC_MESSAGES/gdm.mo
 share/locale/sv/LC_MESSAGES/gdm.mo
 share/locale/ta/LC_MESSAGES/gdm.mo
 share/locale/te/LC_MESSAGES/gdm.mo
+share/locale/tg/LC_MESSAGES/gdm.mo
 share/locale/th/LC_MESSAGES/gdm.mo
 share/locale/tr/LC_MESSAGES/gdm.mo
 share/locale/ug/LC_MESSAGES/gdm.mo
@@ -222,63 +195,8 @@ share/pixmaps/nohost.png
 @exec mkdir -p %D/share/xsessions
 @exec dconf update
 @unexec dconf update
-@unexec /bin/rm -f /var/run/gdm/
-@unexec /bin/rm -f /var/log/gdm/
-@dirrm /var/gdm
-@dirrm /var/cache/gdm
+@unexec rmdir /var/cache/gdm
 @dirrmtry share/xsessions
-@dirrmtry share/help/zh_CN/gdm
-@dirrmtry share/help/uk/gdm
-@dirrmtry share/help/te/gdm
-@dirrmtry share/help/sv/gdm
-@dirrmtry share/help/sl/gdm
-@dirrmtry share/help/ru/gdm
-@dirrmtry share/help/oc/gdm
-@dirrmtry share/help/ko/gdm
-@dirrmtry share/help/it/gdm
-@dirrmtry share/help/id/gdm
-@dirrmtry share/help/gl/gdm
-@dirrmtry share/help/fr/gdm
-@dirrmtry share/help/es/gdm
-@dirrmtry share/help/en_GB/gdm
-@dirrmtry share/help/el/gdm
-@dirrmtry share/help/de/gdm
-@dirrmtry share/help/ca/gdm
-@dirrmtry share/help/C/gdm
-@dirrmtry share/gnome-session/sessions
-@dirrmtry share/gnome-session
-@dirrm %%DATADIR%%/simple-greeter/extensions/unified
-@dirrm %%DATADIR%%/simple-greeter/extensions/smartcard
-@dirrm %%DATADIR%%/simple-greeter/extensions/password
-@dirrm %%DATADIR%%/simple-greeter/extensions/fingerprint
-@dirrm %%DATADIR%%/simple-greeter/extensions
-@dirrm %%DATADIR%%/simple-greeter
-@dirrm %%DATADIR%%/greeter/applications
-@dirrm %%DATADIR%%/greeter/autostart
-@dirrm %%DATADIR%%/greeter
-@dirrm %%DATADIR%%
-@dirrm lib/gdm/simple-greeter/extensions
-@dirrm lib/gdm/simple-greeter
-@dirrm lib/gdm
-@dirrm include/gdm/simple-greeter
-@dirrm include/gdm
-@dirrmtry etc/gdm/home/.local/share/applications
-@dirrmtry etc/gdm/home/.local/share
-@dirrmtry etc/gdm/home/.local
-@unexec rm -rf %D/etc/gdm/home/.gconf*
-@dirrmtry etc/gdm/home/.config/dconf
-@dirrmtry etc/gdm/home/.config
-@dirrmtry etc/gdm/home
-@dirrmtry etc/gdm/Sessions
-@dirrmtry etc/gdm/PreSession
-@dirrmtry etc/gdm/PostSession
-@dirrmtry etc/gdm/PostLogin
-@dirrmtry etc/gdm/Init
-@dirrmtry etc/gdm
-@dirrmtry etc/dm/Sessions
-@dirrmtry etc/dm
-@dirrm etc/dconf/db/gdm.d/locks
-@dirrm etc/dconf/db/gdm.d
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -345,3 +263,50 @@ share/pixmaps/nohost.png
 @dirrmtry share/locale/as
 @dirrmtry share/locale/an/LC_MESSAGES
 @dirrmtry share/locale/an
+@dirrmtry share/help/zh_CN/gdm
+@dirrmtry share/help/uk/gdm
+@dirrmtry share/help/te/gdm
+@dirrmtry share/help/te
+@dirrmtry share/help/sv/gdm
+@dirrmtry share/help/sl/gdm
+@dirrmtry share/help/ru/gdm
+@dirrmtry share/help/pt_BR/gdm
+@dirrmtry share/help/oc/gdm
+@dirrmtry share/help/ko/gdm
+@dirrmtry share/help/it/gdm
+@dirrmtry share/help/it
+@dirrmtry share/help/id/gdm
+@dirrmtry share/help/id
+@dirrmtry share/help/gl/gdm
+@dirrmtry share/help/fr/gdm
+@dirrmtry share/help/es/gdm
+@dirrmtry share/help/en_GB/gdm
+@dirrmtry share/help/el/gdm
+@dirrmtry share/help/de/gdm
+@dirrmtry share/help/ca/gdm
+@dirrmtry share/help/C/gdm
+@dirrmtry share/gnome-session/sessions
+@dirrmtry share/gnome-session
+@dirrm %%DATADIR%%/greeter/applications
+@dirrm %%DATADIR%%/greeter/autostart
+@dirrm %%DATADIR%%/greeter
+@dirrm %%DATADIR%%
+@dirrmtry share/dconf/profile
+@dirrmtry share/dconf
+@dirrm include/gdm
+@unexec rm -rf %D/etc/gdm/home/.gconf*
+@dirrmtry etc/gdm/Sessions
+@dirrmtry etc/gdm/PreSession
+@dirrmtry etc/gdm/PostSession
+@dirrmtry etc/gdm/PostLogin
+@dirrmtry etc/gdm/Init
+@dirrmtry etc/gdm/home/.pulse
+@dirrmtry etc/gdm/home/.local/share/applications
+@dirrmtry etc/gdm/home/.local/share
+@dirrmtry etc/gdm/home/.local
+@dirrmtry etc/gdm/home
+@dirrmtry etc/gdm
+@dirrmtry etc/dm/Sessions
+@dirrmtry etc/dm
+@unexec rmdir /var/run/gdm/greeter/ 2> /dev/null || true
+@unexec rmdir /var/log/gdm/ 2> /dev/null || true