Upgrade the Cinnamon desktop environment to version 4.8

This version uses Python 3 instead of the expired Python 2.7 From the main PR (249856): " There are a couple known issues: * x11-fm/nemo crashes upon closing a window or tab. * x11/cinnamon-screensaver unlocking doesn't work, most likely due to a missing PAM (Linux-PAM?) integration. Both of these issues are being worked on. I've been dogfooding since Cinnamon 4.0, and apart from those issues, everything works." PR: 249771 PR: 249851 PR: 249855 PR: 249856 PR: 249857 PR: 249858 Submitted by: Charlie Li
author: Rene Ladan <rene@FreeBSD.org> 2021-01-02 11:21:30 +0000
committer: Rene Ladan <rene@FreeBSD.org> 2021-01-02 11:21:30 +0000
commit: 474895cdb67df33222fa2b2e67a4c6fc7dea0fa7 (patch)
tree: 88f0bd8b077f4fe5cb17646d5336161aa4610b11 /x11
parent: 9729352622704f6096153cf167ef06a4d7085051 (diff)
download: ports-474895cdb67df33222fa2b2e67a4c6fc7dea0fa7.tar.gz
ports-474895cdb67df33222fa2b2e67a4c6fc7dea0fa7.zip
24 files changed, 897 insertions, 1282 deletions
diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index e3f794c6ecd2..8737351dc48f 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -2,31 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-desktop
-PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTVERSION=	4.8.1
 CATEGORIES=	x11 gnome
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional UI API for cinnamon
 
-BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
-		xkeyboard-config>=0:x11/xkeyboard-config \
+LICENSE=	GPLv2 LGPL20
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LIB
+
+BUILD_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config \
 		libxkbfile>=0:x11/libxkbfile
+LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 RUN_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config \
 		libxkbfile>=0:x11/libxkbfile
 
-USES=		autoreconf gettext gmake gnome libtool localbase:ldflags \
-		pathfix pkgconfig python:2.7,run shebangfix tar:xz xorg
-USE_XORG=	x11 xrandr xext
+USES=		gettext gnome localbase meson pkgconfig python:3.5+,build shebangfix xorg
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection
+USE_XORG=	x11 xext xrandr
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build
-SHEBANG_FILES=	files/usr/bin/cinnamon-desktop-migrate-mediakeys
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project"
-INSTALL_TARGET=	install-strip
+
+SHEBANG_FILES=	install-scripts/meson_install_schemas.py installer-test
+
 GLIB_SCHEMAS=	org.cinnamon.desktop.a11y.applications.gschema.xml \
 		org.cinnamon.desktop.a11y.keyboard.gschema.xml \
 		org.cinnamon.desktop.a11y.magnifier.gschema.xml \
@@ -50,13 +53,9 @@ GLIB_SCHEMAS=	org.cinnamon.desktop.a11y.applications.gschema.xml \
 		org.cinnamon.desktop.thumbnailers.gschema.xml \
 		org.cinnamon.desktop.wm.preferences.gschema.xml
 
-post-patch:
-	@${MKDIR} ${WRKSRC}/files${PREFIX}
-.for d in bin
-	@${MV} ${WRKSRC}/files/usr/${d} ${WRKSRC}/files${PREFIX}
-.endfor
+OPTIONS_DEFINE=	ALSA
 
-	@${REINPLACE_CMD} -e 's|find -min|find . -|g' \
-		${WRKSRC}/files/Makefile.am
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_MESON_TRUE=	alsa
 
 .include <bsd.port.mk>
diff --git a/x11/cinnamon-desktop/distinfo b/x11/cinnamon-desktop/distinfo
index 358f2560b0ef..f47fd9557972 100644
--- a/x11/cinnamon-desktop/distinfo
+++ b/x11/cinnamon-desktop/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/linuxmint-cinnamon-desktop-2.4.2_GH0.tar.gz) = 62e2ff4fad405f8d4e7259dbeb2daf65c6f8b9995f2bb1e595a7cc0c2a7f9e0a
-SIZE (gnome3/linuxmint-cinnamon-desktop-2.4.2_GH0.tar.gz) = 524074
+TIMESTAMP = 1608877630
+SHA256 (gnome/linuxmint-cinnamon-desktop-4.8.1_GH0.tar.gz) = cb9aeff385764ba33cf4f7ee2bb5cb7308960670e8fa9f3be38a1d431b20436d
+SIZE (gnome/linuxmint-cinnamon-desktop-4.8.1_GH0.tar.gz) = 495417
diff --git a/x11/cinnamon-desktop/pkg-plist b/x11/cinnamon-desktop/pkg-plist
index 15eb812da815..ba5c8a2fb00f 100644
--- a/x11/cinnamon-desktop/pkg-plist
+++ b/x11/cinnamon-desktop/pkg-plist
@@ -1,24 +1,37 @@
-bin/cinnamon-desktop-migrate-mediakeys
 include/cinnamon-desktop/libcinnamon-desktop/cdesktop-enums.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-bg-crossfade.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-bg.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-desktop-thumbnail.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-desktop-utils.h
+include/cinnamon-desktop/libcinnamon-desktop/gnome-installer.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-pnp-ids.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-rr-config.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-rr-labeler.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-rr.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-wall-clock.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-xkb-info.h
+include/cinnamon-desktop/libcvc/gvc-channel-map.h
+include/cinnamon-desktop/libcvc/gvc-mixer-card.h
+include/cinnamon-desktop/libcvc/gvc-mixer-control.h
+include/cinnamon-desktop/libcvc/gvc-mixer-sink-input.h
+include/cinnamon-desktop/libcvc/gvc-mixer-source-output.h
+include/cinnamon-desktop/libcvc/gvc-mixer-source.h
+include/cinnamon-desktop/libcvc/gvc-mixer-stream.h
+include/cinnamon-desktop/libcvc/gvc-mixer-ui-device.h
+lib/girepository-1.0/CDesktopEnums-3.0.typelib
+lib/girepository-1.0/CinnamonDesktop-3.0.typelib
+lib/girepository-1.0/Cvc-1.0.typelib
 lib/libcinnamon-desktop.so
 lib/libcinnamon-desktop.so.4
 lib/libcinnamon-desktop.so.4.0.0
-lib/girepository-1.0/CDesktopEnums-3.0.typelib
-lib/girepository-1.0/CinnamonDesktop-3.0.typelib
+lib/libcvc.so
+lib/libcvc.so.0
+lib/libcvc.so.0.0.0
 libdata/pkgconfig/cinnamon-desktop.pc
-libexec/cinnamon-rr-debug
+libdata/pkgconfig/cvc.pc
 share/gir-1.0/CDesktopEnums-3.0.gir
 share/gir-1.0/CinnamonDesktop-3.0.gir
+share/gir-1.0/Cvc-1.0.gir
 share/libcinnamon-desktop/pnp.ids
 share/locale/af/LC_MESSAGES/cinnamon-desktop.mo
 share/locale/am/LC_MESSAGES/cinnamon-desktop.mo
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index faf0272a2cdf..35349ebf72ad 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -2,29 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-menus
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	4.8.2
 CATEGORIES=	x11 gnome
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional UI API for cinnamon
 
-BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
-		xkeyboard-config>=0:x11/xkeyboard-config \
-		libxkbfile>=0:x11/libxkbfile
-RUN_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config \
-		libxkbfile>=0:x11/libxkbfile
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
+
+USES=		gnome meson pkgconfig
+
+USE_GNOME=	glib20 introspection:build
 
-USES=		autoreconf gettext gmake gnome libtool pathfix pkgconfig \
-		python:2.7 tar:xz
-USE_GNOME=	gnomemenus3 gnomeprefix gtk30 introspection:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
+
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/x11/cinnamon-menus/distinfo b/x11/cinnamon-menus/distinfo
index 49bf4b38d719..1ca8c7539219 100644
--- a/x11/cinnamon-menus/distinfo
+++ b/x11/cinnamon-menus/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/linuxmint-cinnamon-menus-2.4.1_GH0.tar.gz) = 7ab04bb668c80c3a1acccaa07f1b5d22023f397841735f4c4243c10cda717e5c
-SIZE (gnome3/linuxmint-cinnamon-menus-2.4.1_GH0.tar.gz) = 518008
+TIMESTAMP = 1608877915
+SHA256 (gnome/linuxmint-cinnamon-menus-4.8.2_GH0.tar.gz) = 6c19ebcea0d35a7a65cd70f1cdca2c5c739467ac6d2c2a1c38a5d580296707bd
+SIZE (gnome/linuxmint-cinnamon-menus-4.8.2_GH0.tar.gz) = 101831
diff --git a/x11/cinnamon-menus/pkg-plist b/x11/cinnamon-menus/pkg-plist
index fead2ebd7056..40191c9931a3 100644
--- a/x11/cinnamon-menus/pkg-plist
+++ b/x11/cinnamon-menus/pkg-plist
@@ -1,5 +1,5 @@
+include/cinnamon-menus-3.0/gmenu-desktopappinfo.h
 include/cinnamon-menus-3.0/gmenu-tree.h
-lib/libcinnamon-menu-3.a
 lib/libcinnamon-menu-3.so
 lib/libcinnamon-menu-3.so.0
 lib/libcinnamon-menu-3.so.0.0.1
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 99e19f4b2a4c..d46fb90962fc 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -2,56 +2,56 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-screensaver
-PORTVERSION=	2.4.1
-PORTREVISION=	2
+PORTVERSION=	4.8.1
 CATEGORIES=	x11 gnome
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME screen saver and locker
+COMMENT=	Cinnamon screen saver and locker
 
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv2+ LGPL21
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
-		gnome-autogen.sh:devel/gnome-common
-LIB_DEPENDS=	libnotify.so:devel/libnotify \
+BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice \
 		libcinnamon-desktop.so:x11/cinnamon-desktop \
 		libdbus-glib-1.so:devel/dbus-glib
-RUN_DEPENDS=	pam_helper:security/pam_helper \
-		gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
-		gnome-keyring>=0:security/gnome-keyring
+RUN_DEPENDS=	${LOCALBASE}/lib/pam_gnome_keyring.so:security/gnome-keyring \
+		${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-xapp>0:x11/py-python-xapp@${PY_FLAVOR}
+
+USES=		gettext-tools gnome meson pkgconfig python:3.5+ shebangfix xorg
 
-USES=		autoreconf:build gettext gmake gnome libtool pathfix pkgconfig \
-		xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_XORG=	x11 xext xxf86vm xscrnsaver
-USE_GNOME=	gnomedesktop3 gnomeprefix intlhack intlhack libgnomekbd libxml2
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS=		-I${LOCALBASE}/include -Wno-error=format-nonliteral
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-pam-prefix=${PREFIX}/etc/pam.d \
-		--without-systemd
-INSTALL_TARGET=	install-strip
+
+USE_XORG=	x11 xext xinerama xrandr xscrnsaver
+
+USE_GNOME=	cairo gdkpixbuf2 intltool introspection:build libgnomekbd pygobject3
+
+INSTALLS_ICONS=	yes
+
+SHEBANG_GLOB=	*.py
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+
+USE_LDCONFIG=	yes
 
 SUB_FILES+=	cinnamon-screensaver.pam
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
-		${WRKSRC}/src/gs-auth-pam.c
-	@${REINPLACE_CMD} -e 's|find -m|find . -m|g' \
-		${WRKSRC}/files/Makefile.in
-	@${ECHO} "#define PASSWD_HELPER_PROGRAM \"/usr/local/bin/pam_helper\"" \
-		>> ${WRKSRC}/config.h.in
+	@${FIND} ${WRKSRC} -name \*.py | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|/usr/bin|${PREFIX}/bin|g' \
+		-e 's|/usr/lib|${PREFIX}/lib|g' \
+		-e 's|/usr/share|${PREFIX}/share|g'
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
+		${WRKSRC}/src/pamhelper/cinnamon-screensaver-pam-helper.c \
+		${WRKSRC}/libcscreensaver/test-passwd.c
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/cinnamon-screensaver.pam \
 		${STAGEDIR}${PREFIX}/etc/pam.d/cinnamon-screensaver
-	${RM} -r ${STAGEDIR}${PREFIX}/etc/pam.d/pam.d/
-
-pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/x11/cinnamon-screensaver/distinfo b/x11/cinnamon-screensaver/distinfo
index 7599b4684136..05d5ca7a164e 100644
--- a/x11/cinnamon-screensaver/distinfo
+++ b/x11/cinnamon-screensaver/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/linuxmint-cinnamon-screensaver-2.4.1_GH0.tar.gz) = e73c5d483cd4faeb8d7a4fec9bb1ab73df5cef5d05a3ab268f7a29947d2a483e
-SIZE (gnome3/linuxmint-cinnamon-screensaver-2.4.1_GH0.tar.gz) = 142276
+TIMESTAMP = 1608879152
+SHA256 (gnome/linuxmint-cinnamon-screensaver-4.8.1_GH0.tar.gz) = e06a9f28cba55c38d1464d02917eb374de941fd09007608c239a348e7653b675
+SIZE (gnome/linuxmint-cinnamon-screensaver-4.8.1_GH0.tar.gz) = 141996
diff --git a/x11/cinnamon-screensaver/files/cinnamon-screensaver.pam.in b/x11/cinnamon-screensaver/files/cinnamon-screensaver.pam.in
index 539ca0ee7e13..508baf07d5b1 100644
--- a/x11/cinnamon-screensaver/files/cinnamon-screensaver.pam.in
+++ b/x11/cinnamon-screensaver/files/cinnamon-screensaver.pam.in
@@ -1,3 +1,5 @@
 auth		include		system
 auth		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so
 account		include		system
+password	include		system
+session		include		system
diff --git a/x11/cinnamon-screensaver/files/patch-src_gs-auth-helper.c b/x11/cinnamon-screensaver/files/patch-src_gs-auth-helper.c
deleted file mode 100644
index 00e8766f402c..000000000000
--- a/x11/cinnamon-screensaver/files/patch-src_gs-auth-helper.c
+++ /dev/null
@@ -1,201 +0,0 @@
---- src/gs-auth-helper.c.orig	2011-03-16 17:24:06.000000000 -0500
-+++ src/gs-auth-helper.c	2011-03-16 17:23:55.000000000 -0500
-@@ -0,0 +1,198 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * written by Olaf Kirch <okir@suse.de>
-+ * xscreensaver, Copyright (c) 1993-2004 Jamie Zawinski <jwz@jwz.org>
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation.  No representations are made about the suitability of this
-+ * software for any purpose.  It is provided "as is" without express or 
-+ * implied warranty.
-+ */
-+
-+/* The idea here is to be able to run gnome-screensaver-dialog without any setuid bits.
-+ * Password verification happens through an external program that you feed
-+ * your password to on stdin.  The external command is invoked with a user
-+ * name argument.
-+ *
-+ * The external helper does whatever authentication is necessary.  Currently,
-+ * SuSE uses "unix2_chkpwd", which is a variation of "unix_chkpwd" from the
-+ * PAM distribution.
-+ *
-+ * Normally, the password helper should just authenticate the calling user
-+ * (i.e. based on the caller's real uid).  This is in order to prevent
-+ * brute-forcing passwords in a shadow environment.  A less restrictive
-+ * approach would be to allow verifying other passwords as well, but always
-+ * with a 2 second delay or so.  (Not sure what SuSE's "unix2_chkpwd"
-+ * currently does.)
-+ *                         -- Olaf Kirch <okir@suse.de>, 16-Dec-2003
-+ */
-+
-+#include "config.h"
-+
-+#include <stdlib.h>
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include <errno.h>
-+#include <sys/wait.h>
-+
-+#include <glib.h>
-+#include <glib/gstdio.h>
-+
-+#include "gs-auth.h"
-+#include "subprocs.h"
-+
-+static gboolean verbose_enabled = FALSE;
-+
-+GQuark
-+gs_auth_error_quark (void)
-+{
-+        static GQuark quark = 0;
-+        if (! quark) {
-+                quark = g_quark_from_static_string ("gs_auth_error");
-+        }
-+
-+        return quark;
-+}
-+
-+void
-+gs_auth_set_verbose (gboolean enabled)
-+{
-+        verbose_enabled = enabled;
-+}
-+
-+gboolean
-+gs_auth_get_verbose (void)
-+{
-+        return verbose_enabled;
-+}
-+
-+static gboolean
-+ext_run (const char *user,
-+         const char *typed_passwd,
-+         gboolean    verbose)
-+{
-+        int   pfd[2], status;
-+        pid_t pid;
-+
-+        if (pipe (pfd) < 0) {
-+                return 0;
-+        }
-+
-+        if (verbose) {
-+                g_message ("ext_run (%s, %s)",
-+                           PASSWD_HELPER_PROGRAM, user);
-+        }
-+
-+        block_sigchld ();
-+
-+        if ((pid = fork ()) < 0) {
-+                close (pfd [0]);
-+                close (pfd [1]);
-+                return FALSE;
-+        }
-+
-+        if (pid == 0) {
-+                close (pfd [1]);
-+                if (pfd [0] != 0) {
-+                        dup2 (pfd [0], 0);
-+                }
-+
-+                /* Helper is invoked as helper service-name [user] */
-+                execlp (PASSWD_HELPER_PROGRAM, PASSWD_HELPER_PROGRAM, "gnome-screensaver", user, NULL);
-+                if (verbose) {
-+                        g_message ("%s: %s", PASSWD_HELPER_PROGRAM, g_strerror (errno));
-+                }
-+
-+                exit (1);
-+        }
-+
-+        close (pfd [0]);
-+
-+        /* Write out password to helper process */
-+        if (!typed_passwd) {
-+                typed_passwd = "";
-+        }
-+        write (pfd [1], typed_passwd, strlen (typed_passwd));
-+        close (pfd [1]);
-+
-+        while (waitpid (pid, &status, 0) < 0) {
-+                if (errno == EINTR) {
-+                        continue;
-+                }
-+
-+                if (verbose) {
-+                        g_message ("ext_run: waitpid failed: %s\n",
-+                                   g_strerror (errno));
-+                }
-+
-+                unblock_sigchld ();
-+                return FALSE;
-+        }
-+
-+        unblock_sigchld ();
-+
-+        if (! WIFEXITED (status) || WEXITSTATUS (status) != 0) {
-+                return FALSE;
-+        }
-+
-+        return TRUE;
-+}
-+
-+gboolean
-+gs_auth_verify_user (const char       *username,
-+                     const char       *display,
-+                     GSAuthMessageFunc func,
-+                     gpointer          data,
-+                     GError          **error)
-+{
-+        gboolean       res = FALSE;
-+        char          *password;
-+
-+        password = NULL;
-+
-+        /* ask for the password for user */
-+        if (func != NULL) {
-+                func (GS_AUTH_MESSAGE_PROMPT_ECHO_OFF,
-+                      "Password: ",
-+                      &password,
-+                      data);
-+        }
-+
-+        if (password == NULL) {
-+                return FALSE;
-+        }
-+
-+        res = ext_run (username, password, gs_auth_get_verbose ());
-+
-+        return res;
-+}
-+
-+gboolean
-+gs_auth_init (void)
-+{
-+        return TRUE;
-+}
-+
-+gboolean
-+gs_auth_priv_init (void)
-+{
-+        /* Make sure the passwd helper exists */
-+        if (g_access (PASSWD_HELPER_PROGRAM, X_OK) < 0) {
-+                g_warning ("%s does not exist. "
-+                           "password authentication via "
-+                           "external helper will not work.",
-+                           PASSWD_HELPER_PROGRAM);
-+                return FALSE;
-+        }
-+
-+        return TRUE;
-+}
diff --git a/x11/cinnamon-screensaver/pkg-plist b/x11/cinnamon-screensaver/pkg-plist
index 502af42763d6..7b7c3c9ac13c 100644
--- a/x11/cinnamon-screensaver/pkg-plist
+++ b/x11/cinnamon-screensaver/pkg-plist
@@ -1,8 +1,71 @@
 bin/cinnamon-screensaver
 bin/cinnamon-screensaver-command
 etc/pam.d/cinnamon-screensaver
-libexec/cinnamon-screensaver-dialog
-man/man1/cinnamon-screensaver-command.1.gz
-man/man1/cinnamon-screensaver.1.gz
+include/cinnamon-screensaver/libcscreensaver/cs-auth.h
+include/cinnamon-screensaver/libcscreensaver/setuid.h
+lib/girepository-1.0/CScreensaver-1.0.typelib
+lib/libcscreensaver.so
+lib/libcscreensaver.so.0
+lib/libcscreensaver.so.0.0.0
+libdata/pkgconfig/cscreensaver.pc
+libexec/cinnamon-screensaver-pam-helper
+%%DATADIR%%/__init__.py
+%%DATADIR%%/albumArt.py
+%%DATADIR%%/audioPanel.py
+%%DATADIR%%/baseWindow.py
+%%DATADIR%%/cinnamon-screensaver-command.py
+%%DATADIR%%/cinnamon-screensaver-main.py
+%%DATADIR%%/cinnamon-screensaver.css
+%%DATADIR%%/clock.py
+%%DATADIR%%/config.py
+%%DATADIR%%/constants.py
+%%DATADIR%%/dbusdepot/__init__.py
+%%DATADIR%%/dbusdepot/accountsServiceClient.py
+%%DATADIR%%/dbusdepot/baseClient.py
+%%DATADIR%%/dbusdepot/cinnamonClient.py
+%%DATADIR%%/dbusdepot/consoleKitClient.py
+%%DATADIR%%/dbusdepot/keybindingHandlerClient.py
+%%DATADIR%%/dbusdepot/loginInterface.py
+%%DATADIR%%/dbusdepot/logindClient.py
+%%DATADIR%%/dbusdepot/mediaPlayerWatcher.py
+%%DATADIR%%/dbusdepot/nameBlocker.py
+%%DATADIR%%/dbusdepot/screensaverClient.py
+%%DATADIR%%/dbusdepot/sessionClient.py
+%%DATADIR%%/dbusdepot/uPowerClient.py
+%%DATADIR%%/floating.py
+%%DATADIR%%/infoPanel.py
+%%DATADIR%%/manager.py
+%%DATADIR%%/monitorView.py
+%%DATADIR%%/osk.py
+%%DATADIR%%/pamhelper/authClient.py
+%%DATADIR%%/passwordEntry.py
+%%DATADIR%%/playerControl.py
+%%DATADIR%%/service.py
+%%DATADIR%%/singletons.py
+%%DATADIR%%/stage.py
+%%DATADIR%%/status.py
+%%DATADIR%%/unlock.py
+%%DATADIR%%/util/__init__.py
+%%DATADIR%%/util/eventHandler.py
+%%DATADIR%%/util/fader.py
+%%DATADIR%%/util/focusNavigator.py
+%%DATADIR%%/util/grabHelper.py
+%%DATADIR%%/util/keybindings.py
+%%DATADIR%%/util/settings.py
+%%DATADIR%%/util/trackers.py
+%%DATADIR%%/util/utils.py
+%%DATADIR%%/volumeControl.py
+%%DATADIR%%/widgets/__init__.py
+%%DATADIR%%/widgets/framedImage.py
+%%DATADIR%%/widgets/marqueeLabel.py
+%%DATADIR%%/widgets/notificationWidget.py
+%%DATADIR%%/widgets/powerWidget.py
+%%DATADIR%%/widgets/transparentButton.py
+%%DATADIR%%/widgets/volumeSlider.py
 share/applications/cinnamon-screensaver.desktop
 share/dbus-1/services/org.cinnamon.ScreenSaver.service
+share/gir-1.0/CScreensaver-1.0.gir
+share/icons/hicolor/scalable/actions/screensaver-switch-users-symbolic.svg
+share/icons/hicolor/scalable/actions/screensaver-unlock-symbolic.svg
+share/icons/hicolor/scalable/status/screensaver-blank.svg
+share/icons/hicolor/scalable/status/screensaver-notification-symbolic.svg
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index b1603e104b30..b46c5b6ce3ea 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -2,40 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon-session
-PORTVERSION=	2.4.3
-PORTREVISION=	3
+PORTVERSION=	4.8.0
 CATEGORIES=	x11 gnome
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the cinnamon desktop
 
-BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common
-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
-		libjson-glib-1.0.so:devel/json-glib \
-		libupower-glib.so:sysutils/upower \
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libxapp.so:x11/xapp \
 		libcanberra.so:audio/libcanberra
-RUN_DEPENDS=	console-kit-daemon:sysutils/consolekit2 \
-		xdpyinfo:x11/xdpyinfo
+RUN_DEPENDS=	console-kit-daemon:sysutils/consolekit2
+
+USES=		gl gnome meson pkgconfig python:3.5+,build shebangfix xorg
 
-USES=		autoreconf:build gettext gl gmake gnome libtool \
-		pathfix pkgconfig tar:xz xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_GNOME=	gnomeprefix gtk30 intlhack
-USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
+
+SHEBANG_FILES=	data/meson_install_schemas.py
+
+USE_GNOME=	cairo gdkpixbuf2 gtk30
+USE_XORG=	ice sm x11 xau xcomposite xext xrender xtrans xtst
 USE_GL=		gl
 INSTALLS_ICONS=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-docbook-docs
-CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
-CFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
-LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.cinnamon.SessionManager.gschema.xml
 
-pre-configure:
-	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
+OPTIONS_DEFINE=	DOCS GCONF IPV6
+OPTIONS_DEFAULT=	IPV6
+
+DOCS_BUILD_DEPENDS=	xmlto:textproc/xmlto
+DOCS_MESON_TRUE=	docbook
+
+GCONF_USE=		gnome=gconf2
+GCONF_MESON_TRUE=	gconf
+
+IPV6_MESON_TRUE=	ipv6
 
 .include <bsd.port.mk>
diff --git a/x11/cinnamon-session/distinfo b/x11/cinnamon-session/distinfo
index 9d63f181db6e..ce4dd888fe17 100644
--- a/x11/cinnamon-session/distinfo
+++ b/x11/cinnamon-session/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/linuxmint-cinnamon-session-2.4.3_GH0.tar.gz) = 07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733
-SIZE (gnome3/linuxmint-cinnamon-session-2.4.3_GH0.tar.gz) = 903363
+TIMESTAMP = 1606806314
+SHA256 (gnome/linuxmint-cinnamon-session-4.8.0_GH0.tar.gz) = 66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4
+SIZE (gnome/linuxmint-cinnamon-session-4.8.0_GH0.tar.gz) = 199684
diff --git a/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c b/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c
deleted file mode 100644
index 6857daee2abe..000000000000
--- a/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- cinnamon-session/csm-logout-dialog.c.orig	2014-04-12 10:25:22.000000000 +0000
-+++ cinnamon-session/csm-logout-dialog.c	2014-04-24 08:07:46.179191996 +0000
-@@ -188,6 +188,8 @@
-         return csm_system_can_suspend (logout_dialog->priv->system);
- #elif defined(HAVE_OLD_UPOWER)
-         return up_client_get_can_suspend (logout_dialog->priv->up_client);
-+#else
-+	return FALSE;	
- #endif
- }
- 
-@@ -198,6 +200,8 @@
-         return csm_system_can_hibernate (logout_dialog->priv->system);
- #elif defined(HAVE_OLD_UPOWER)
-         return up_client_get_can_hibernate (logout_dialog->priv->up_client);
-+#else
-+	return FALSE;	
- #endif
- }
- 
diff --git a/x11/cinnamon-session/pkg-plist b/x11/cinnamon-session/pkg-plist
index f4e6359b0ed0..4b04718eddf0 100644
--- a/x11/cinnamon-session/pkg-plist
+++ b/x11/cinnamon-session/pkg-plist
@@ -1,122 +1,15 @@
 bin/cinnamon-session
-bin/cinnamon-session-properties
 bin/cinnamon-session-quit
 libexec/cinnamon-session-check-accelerated
 libexec/cinnamon-session-check-accelerated-helper
-man/man1/cinnamon-session-properties.1.gz
 man/man1/cinnamon-session-quit.1.gz
 man/man1/cinnamon-session.1.gz
-share/applications/cinnamon-session-properties.desktop
-%%DATADIR%%/cinnamon-session-properties.glade
 %%DATADIR%%/csm-inhibit-dialog.glade
 %%DATADIR%%/hardware-compatibility
+%%PORTDOCS%%%%DOCSDIR%%/dbus/cinnamon-session.html
 share/icons/hicolor/16x16/apps/cinnamon-session-properties.png
 share/icons/hicolor/22x22/apps/cinnamon-session-properties.png
 share/icons/hicolor/24x24/apps/cinnamon-session-properties.png
 share/icons/hicolor/32x32/apps/cinnamon-session-properties.png
 share/icons/hicolor/48x48/apps/cinnamon-session-properties.png
 share/icons/hicolor/scalable/apps/cinnamon-session-properties.svg
-share/locale/af/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/am/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ar/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/as/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ast/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/az/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/be/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/be@latin/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/bg/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/bn/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/bn_IN/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/br/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/bs/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ca/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ca@valencia/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/crh/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/cs/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/csb/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/cy/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/da/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/de/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/dz/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/el/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/en@shaw/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/en_CA/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/en_GB/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/eo/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/es/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/et/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/eu/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/fa/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/fi/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/fr/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/fur/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/fy/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ga/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/gl/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/gu/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ha/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/he/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/hi/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/hr/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/hu/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/hy/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/id/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ig/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/is/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/it/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ja/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ka/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/km/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/kn/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ko/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ku/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/lt/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/lv/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/mai/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/mg/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/mi/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/mk/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ml/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/mn/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/mr/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ms/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/nb/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/nds/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ne/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/nl/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/nn/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/nso/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/oc/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/or/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/pa/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/pl/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ps/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/pt/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/pt_BR/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ro/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ru/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/rw/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/si/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/sk/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/sl/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/sq/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/sr/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/sr@latin/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/sv/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ta/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/te/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/th/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/tk/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/tr/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/ug/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/uk/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/uz/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/vi/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/wa/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/xh/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/yo/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/zh_CN/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/zh_HK/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/zh_TW/LC_MESSAGES/cinnamon-session-3.0.mo
-share/locale/zu/LC_MESSAGES/cinnamon-session-3.0.mo
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 74975d754008..d45b1aa00549 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	cinnamon
-PORTVERSION=	2.4.6
-PORTREVISION=	15
+PORTVERSION=	4.8.4
 CATEGORIES=	x11 gnome
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Fork of GNOME Shell with layout similar to GNOME 2
@@ -13,148 +12,107 @@ COMMENT=	Fork of GNOME Shell with layout similar to GNOME 2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-12-31
-
-BUILD_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
-		gnome-autogen.sh:devel/gnome-common
-LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
-		libcaribou.so:accessibility/caribou \
-		libgnome-keyring.so:security/libgnome-keyring \
+BUILD_DEPENDS=	ca_root_nss>0:security/ca_root_nss
+LIB_DEPENDS=	libcjs.so:lang/cjs \
 		libmuffin.so:x11-wm/muffin \
-		libtelepathy-glib.so:net-im/telepathy-glib \
-		libtelepathy-logger.so:net-im/telepathy-logger \
-		libfolks.so:net-im/folks \
-		libpulse.so:audio/pulseaudio \
-		libcroco-0.6.so:textproc/libcroco \
-		libsoup-2.4.so:devel/libsoup \
+		libcinnamon-menu-3.so:x11/cinnamon-menus \
 		libdbus-1.so:devel/dbus \
-		libdbus-glib-1.so:devel/dbus-glib \
-		libcogl.so:graphics/cogl \
 		libpolkit-agent-1.so:sysutils/polkit \
-		libclutter-glx-1.0.so:graphics/clutter \
-		libmozjs-24.so:lang/spidermonkey24 \
-		libcjs.so:lang/cjs \
-		libjson-glib-1.0.so:devel/json-glib \
-		libcinnamon-menu-3.so:x11/cinnamon-menus \
-		libcinnamon-desktop.so:x11/cinnamon-desktop \
-		libaccountsservice.so:sysutils/accountsservice
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
-		ca_root_nss>=0:security/ca_root_nss \
-		gnome-themes-extra>=3.0.0:x11-themes/gnome-themes-extra \
+		libatk-bridge-2.0.so:accessibility/at-spi2-atk \
+		libstartup-notification-1.so:x11/startup-notification \
+		libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
+		ca_root_nss>0:security/ca_root_nss \
+		gnome-themes-extra>3.0.0:x11-themes/gnome-themes-extra \
+		caribou>0:accessibility/caribou \
 		cinnamon-control-center:sysutils/cinnamon-control-center \
-		cinnamon-translations>=0:misc/cinnamon-translations \
 		cinnamon-screensaver:x11/cinnamon-screensaver \
 		nemo:x11-fm/nemo \
 		${PY_PILLOW} \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
-
-USES=		autoreconf compiler:c11 gettext gmake gnome gl libtool \
-		localbase:ldflags pathfix pkgconfig python:2.7 shebangfix xorg
-USE_GITHUB=	yes
-USE_GL=		gl egl
-USE_GNOME=	cairo evolutiondataserver3 gconf2 gnomedesktop3 \
-		gnomeprefix gtk30 intlhack introspection
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-pam>0:security/py-python-pam@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tinycss>0:textproc/py-tinycss@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \
+		timezonemap>0:misc/timezonemap \
+		gnome-backgrounds>0:x11-themes/gnome-backgrounds \
+		metacity:x11-wm/metacity \
+		tint2:x11/tint
+
+USES=		compiler:c11 gettext gl gnome meson pkgconfig python:3.5+ shebangfix xorg
+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool introspection libxml2 pygobject3
+USE_XORG=	x11 xfixes
+USE_GL=		gl
 USE_GSTREAMER1=	yes
-USE_LDCONFIG=	yes
-USE_XORG=	x11 xfixes sm xrandr xext xdamage xcomposite xi
 
+USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 
-# this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})
-SHEBANG_FILES=	files/*	*.py
+SHEBANG_GLOB=	*.py
+SHEBANG_FILES=	files/*
 
 INSTALLS_ICONS=	yes
+USE_LDCONFIG=	yes
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-compile-warnings=no \
-		--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
-
-INSTALL_TARGET=	install-strip
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+MESON_ARGS=	-Ddisable_networkmanager=true
 
 GLIB_SCHEMAS=	org.cinnamon.gschema.xml
 
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_DEFAULT=	DOCS NLS
+OPTIONS_SUB=	yes
 
-NLS_RUN_DEPENDS=	cinnamon-translations>=0:misc/cinnamon-translations
-
-post-patch:
-# we need this for intltoolize otherwise it can't copy the m4 file ...
-	@${MKDIR} ${WRKSRC}/m4
-	@${MKDIR} ${WRKSRC}/files${PREFIX}
-.for d in bin lib share
-	@${MV} ${WRKSRC}/files/usr/${d} ${WRKSRC}/files${PREFIX}
-.endfor
+DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
+DOCS_MESON_TRUE=	docs
 
-	@${REINPLACE_CMD} -e 's|--warn-error||g' ${WRKSRC}/src/Makefile.am
+NLS_RUN_DEPENDS=	cinnamon-translations>0:misc/cinnamon-translations
 
-	@${REINPLACE_CMD} -e 's|/usr/share/cinnamon|${STAGEDIR}${PREFIX}/share/|g ;\
-		s|/usr/lib|${STAGEDIR}${PREFIX}/share/|g' \
-			${WRKSRC}/files/generate_desktop_files
-
-	@${REINPLACE_CMD} -e 's|"usr/lib|"${STAGEDIR}${PREFIX}/share/|g ;\
-		s|"usr/share|"${STAGEDIR}${PREFIX}/share/|g' \
-			${WRKSRC}/files/generate_desktop_files
-
-	@${MV} ${WRKSRC}/files/etc ${WRKSRC}/files${PREFIX}
-	@${RM} ${WRKSRC}/files/${PREFIX}/lib/cinnamon-settings/modules/cs_user.py
-	# Remove a broken link (is applications-merge used anywhere?)
-	@${RM} ${WRKSRC}/files/${PREFIX}/etc/xdg/menus/cinnamon-applications-merged
-
-	@${REINPLACE_CMD} -e 's|AM_GNU_GETTEXT_VERSION(\[0.17\])||g ;\
-		s|AM_GNU_GETTEXT(\[external\])||g' \
-		${WRKSRC}/configure.ac
-
-	@${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \
-		${WRKSRC}/files/Makefile.in
-
-	# is this really needed?
-	@${REINPLACE_CMD} -e 's|const NetworkManager = imports.gi.NetworkManager;||g ;\
-		s|const NMClient = imports.gi.NMClient;||g' \
-			${WRKSRC}/files${PREFIX}/share/cinnamon/applets/network\@cinnamon.org/applet.js
-
-	@${REINPLACE_CMD} -e 's|nm-applet;||g' \
-		${WRKSRC}/files${PREFIX}/share/cinnamon-session/sessions/cinnamon.session \
-		${WRKSRC}/files${PREFIX}/share/cinnamon-session/sessions/cinnamon2d.session
-
-	@${REINPLACE_CMD} -e '/prefix/s|/usr|${PREFIX}|g ; \
-		/datadir/s|/usr|${PREFIX}|g' \
-			${WRKSRC}/files${PREFIX}/lib/cinnamon-menu-editor/cme/config.py
+post-patch:
+	@${REINPLACE_CMD} -e '/prefix/s|/usr|${PREFIX}|g ;\
+		/datadir/s|/usr|${PREFIX}|g ;\
+		/libdir/s|/usr|${PREFIX}|g ;\
+		/libexecdir/s|/usr|${PREFIX}|g' \
+			${WRKSRC}/files/usr/share/cinnamon/cinnamon-menu-editor/cme/config.py
 
-	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share/cinnamon/locale" | \
+	@${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/share/cinnamon/locale" | \
 		${XARGS} ${REINPLACE_CMD} -e "s|/usr/share/cinnamon/locale|${PREFIX}/share/locale|g"
 
-	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share" | \
+	@${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/share" | \
 		${XARGS} ${REINPLACE_CMD} -e "s|/usr/share|${PREFIX}/share|g"
 
-	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/lib" | \
+	@${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/lib" | \
 		${XARGS} ${REINPLACE_CMD} -e "s|/usr/lib|${PREFIX}/lib|g"
 
-# The cs_user.py is not patched until we have the python-pam module
-	@${REINPLACE_CMD} -e 's|"/usr/bin|"${PREFIX}/bin|g' \
-		${WRKSRC}/files${PREFIX}/share/cinnamon/applets/menu@cinnamon.org/applet.js \
-		${WRKSRC}/files${PREFIX}/share/cinnamon/applets/user@cinnamon.org/applet.js \
-		${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/bin/Spices.py \
-#		${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_user.py \
-		${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_screensaver.py \
-		${WRKSRC}/files${PREFIX}/bin/cinnamon-settings \
-		${WRKSRC}/files${PREFIX}/bin/cinnamon-launcher
+	@${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/bin" | \
+		${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin|${PREFIX}/bin|g"
 
-	@${REINPLACE_CMD} -e '/cs-tablet/d; /cs-bluetooth/d; /cs-network/d' \
-			${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/cinnamon-settings.py
+	@${REINPLACE_CMD} -e '/cs-bluetooth/d; /cs-network/d' \
+		${WRKSRC}/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
 
-	@${REINPLACE_CMD} -e '/increase-opacity/d; /decrease-opacity/d' \
-			${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_keyboard.py
+	# Some python files use #! /usr/bin/python (note the space between the bang and the python interpreter
+	@${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \
+		${XARGS} ${REINPLACE_CMD} -e "s|#!.*python.*|#!/usr/bin/env python|g"
 
-	#@${REINPLACE_CMD} -e 's/SIZE\/$$$$CONTEXT/CONTEXT\/$$$$SIZE/g' \
-	#		${WRKSRC}/data/icons/Makefile.am
+	# gtk-doc builds erroneous documentation files otherwise
+	@${FIND} ${WRKSRC} -name '*.orig' -type f -delete
+	@${FIND} ${WRKSRC} -name '*.bak' -type f -delete
 
-	@${REINPLACE_CMD} -e 's|=/usr/bin/|=${PREFIX}/bin/|g' \
-		${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon2d.desktop \
-		${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon.desktop \
-		${WRKSRC}/files${PREFIX}/share/applications/cinnamon2d.desktop
+	# Adhere to our hier(7)
+	@${MKDIR} ${WRKSRC}/files${PREFIX}
+	@${MV} ${WRKSRC}/files/etc ${WRKSRC}/files${PREFIX}
+.	for i in bin share
+		@${MV} ${WRKSRC}/files/usr/${i} ${WRKSRC}/files${PREFIX}
+.	endfor
 
 post-install:
-	@${PYTHON_CMD} ${WRKSRC}/files/generate_desktop_files
+	# Ship the GNOME Backgrounds set
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/cinnamon-background-properties
+	@${LN} -s ${PREFIX}/share/gnome-background-properties/adwaita.xml \
+		${STAGEDIR}${PREFIX}/share/cinnamon-background-properties/adwaita.xml
+	@${LN} -s ${PREFIX}/share/gnome-background-properties/gnome-backgrounds.xml \
+		${STAGEDIR}${PREFIX}/share/cinnamon-background-properties/gnome-backgrounds.xml
 
 .include <bsd.port.mk>
diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo
index dea2509cd476..b54dcf195d5f 100644
--- a/x11/cinnamon/distinfo
+++ b/x11/cinnamon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559109478
-SHA256 (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = f265afa5546f16ba27a6715a5eca90336c0c7339f049eeeaf81238af03a5b338
-SIZE (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = 2813103
+TIMESTAMP = 1608880462
+SHA256 (gnome/linuxmint-cinnamon-4.8.4_GH0.tar.gz) = 2147218039fe125d9771a09b3c373cba9e0b05ee6d12c09101989e12df9cfec9
+SIZE (gnome/linuxmint-cinnamon-4.8.4_GH0.tar.gz) = 2377064
diff --git a/x11/cinnamon/files/patch-configure.ac b/x11/cinnamon/files/patch-configure.ac
deleted file mode 100644
index d4b5512ecf10..000000000000
--- a/x11/cinnamon/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig.ac	2013-02-24 19:16:00.316517145 +0100
-+++ configure.ac	2013-02-24 19:16:08.735516143 +0100
-@@ -82,7 +82,7 @@
-                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
- 			       libcanberra
-                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
--                               libnm-glib libnm-util gnome-keyring-1)
-+                               gnome-keyring-1)
- 
- PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
- 
diff --git a/x11/cinnamon/files/patch-files-usr-lib-cinnamon-settings_cinnamon-settings.py b/x11/cinnamon/files/patch-files-usr-lib-cinnamon-settings_cinnamon-settings.py
deleted file mode 100644
index b5de9f46fb46..000000000000
--- a/x11/cinnamon/files/patch-files-usr-lib-cinnamon-settings_cinnamon-settings.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- files/usr/lib/cinnamon-settings/cinnamon-settings.orig.py	2013-02-26 17:20:22.252933982 +0100
-+++ files/usr/lib/cinnamon-settings/cinnamon-settings.py	2013-02-26 17:21:19.081928251 +0100
-@@ -17,7 +17,8 @@
-     if len(mod_files) is 0:
-         raise Exception("No settings modules found!!")
-     for i in range(len(mod_files)):
--        mod_files[i] = mod_files[i].split('/')[5]
-+        mod_files[i] = mod_files[i].split('/')
-+        mod_files[i] = mod_files[i][len(mod_files[i])-1]
-         mod_files[i] = mod_files[i].split('.')[0]
-         if mod_files[i][0:3] != "cs_":
-             raise Exception("Settings modules must have a prefix of 'cs_' !!")
diff --git a/x11/cinnamon/files/patch-files_Makefile.in b/x11/cinnamon/files/patch-files_Makefile.in
deleted file mode 100644
index d348f327b9ad..000000000000
--- a/x11/cinnamon/files/patch-files_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- files/Makefile.orig.in	2013-02-24 22:40:45.200518946 +0100
-+++ files/Makefile.in	2013-02-24 22:40:55.794515056 +0100
-@@ -5,7 +5,7 @@
- distclean:
- 
- install:
--	find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
-+	find . -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
- 
- uninstall:
--	find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
-+	find . -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
diff --git a/x11/cinnamon/files/patch-files_usr_lib_cinnamon-settings_bin_imtools.py b/x11/cinnamon/files/patch-files_usr_lib_cinnamon-settings_bin_imtools.py
deleted file mode 100644
index 1f675652bdba..000000000000
--- a/x11/cinnamon/files/patch-files_usr_lib_cinnamon-settings_bin_imtools.py
+++ /dev/null
@@ -1,60 +0,0 @@
-From c843f3664064742e2672e0fea528571a882d84ad Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
-
---- files/usr/lib/cinnamon-settings/bin/imtools.py.orig	2019-05-23 10:40:29 UTC
-+++ files/usr/lib/cinnamon-settings/bin/imtools.py
-@@ -618,32 +618,6 @@ def has_transparency(image):
-     return (image.mode == 'P' and 'transparency' in image.info) or\
-             has_alpha(image)
- 
--
--if Image.VERSION == '1.1.7':
--
--    def split(image):
--        """Work around for bug in Pil 1.1.7
--
--        :param image: input image
--        :type image: PIL image object
--        :returns: the different color bands of the image (eg R, G, B)
--        :rtype: tuple
--        """
--        image.load()
--        return image.split()
--else:
--
--    def split(image):
--        """Work around for bug in Pil 1.1.7
--
--        :param image: input image
--        :type image: PIL image object
--        :returns: the different color bands of the image (eg R, G, B)
--        :rtype: tuple
--        """
--        return image.split()
--
--
- def get_alpha(image):
-     """Gets the image alpha band. Can handles P mode images with transpareny.
-     Returns a band with all values set to 255 if no alpha band exists.
-@@ -654,7 +628,7 @@ def get_alpha(image):
-     :rtype: single band image object
-     """
-     if has_alpha(image):
--        return split(image)[-1]
-+        return image.split()[-1]
-     if image.mode == 'P' and 'transparency' in image.info:
-         return image.convert('RGBA').split()[-1]
-     # No alpha layer, create one.
diff --git a/x11/cinnamon/files/patch-src_Makefile.am b/x11/cinnamon/files/patch-src_Makefile.am
deleted file mode 100644
index a4d13f941c9e..000000000000
--- a/x11/cinnamon/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/Makefile.am.orig	2015-01-19 15:45:53 UTC
-+++ src/Makefile.am
-@@ -165,7 +165,6 @@ cinnamon_real_SOURCES =		\
- 	main.c
- cinnamon_real_CPPFLAGS = $(cinnamon_cflags)
- cinnamon_real_LDADD = libcinnamon.la libcinnamon-js.la $(libcinnamon_la_LIBADD)
--cinnamon_real_DEPENDENCIES = libcinnamon.la
- 
- ########################################
- 
-@@ -286,7 +285,7 @@ libcinnamon_la_LIBADD =		\
- libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
- 
- Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
--Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
- Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
- Cinnamon_0_1_gir_LIBS = libcinnamon.la
- Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
diff --git a/x11/cinnamon/files/patch-src_st_st.background.c b/x11/cinnamon/files/patch-src_st_st.background.c
deleted file mode 100644
index 29d69332377f..000000000000
--- a/x11/cinnamon/files/patch-src_st_st.background.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/st/st-background-effect.orig.c	2013-02-24 19:18:24.592514376 +0100
-+++ src/st/st-background-effect.c	2013-02-24 19:18:36.891516814 +0100
-@@ -225,7 +225,7 @@
-        || ( posy != self->posy_old)
-        || ( width != self->width_old)
-        || ( height != self->height_old)
--       || (time_used > 50.0d))
-+       || (time_used > 50.0))
- 
-   {
-     self->posx_old = posx;
diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist
index 8d428253dbe5..1cf5a1ba992a 100644
--- a/x11/cinnamon/pkg-plist
+++ b/x11/cinnamon/pkg-plist
@@ -1,7 +1,9 @@
 bin/cinnamon
 bin/cinnamon-desktop-editor
-bin/cinnamon-extension-tool
+bin/cinnamon-file-dialog
+bin/cinnamon-install-spice
 bin/cinnamon-json-makepot
+bin/cinnamon-killer-daemon
 bin/cinnamon-launcher
 bin/cinnamon-looking-glass
 bin/cinnamon-menu-editor
@@ -12,91 +14,30 @@ bin/cinnamon-session-cinnamon2d
 bin/cinnamon-settings
 bin/cinnamon-settings-users
 bin/cinnamon-slideshow
+bin/cinnamon-subprocess-wrapper
+bin/cinnamon-xlet-makepot
 bin/cinnamon2d
+bin/xlet-about-dialog
+bin/xlet-settings
 etc/xdg/menus/cinnamon-applications.menu
 lib/cinnamon/Cinnamon-0.1.typelib
-lib/cinnamon/CinnamonJS-0.1.typelib
-lib/cinnamon/Gvc-1.0.typelib
 lib/cinnamon/St-1.0.typelib
-lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
-lib/cinnamon-desktop-editor/directory-editor.ui
-lib/cinnamon-desktop-editor/launcher-editor.ui
-lib/cinnamon-json-makepot/cinnamon-json-makepot.py
-lib/cinnamon-looking-glass/cinnamon-looking-glass.py
-lib/cinnamon-looking-glass/lookingglass_proxy.py
-lib/cinnamon-looking-glass/page_extensions.py
-lib/cinnamon-looking-glass/page_inspect.py
-lib/cinnamon-looking-glass/page_log.py
-lib/cinnamon-looking-glass/page_memory.py
-lib/cinnamon-looking-glass/page_results.py
-lib/cinnamon-looking-glass/page_windows.py
-lib/cinnamon-looking-glass/pageutils.py
-lib/cinnamon-menu-editor/cinnamon-menu-editor.ui
-lib/cinnamon-menu-editor/cme/MainWindow.py
-lib/cinnamon-menu-editor/cme/MenuEditor.py
-lib/cinnamon-menu-editor/cme/__init__.py
-lib/cinnamon-menu-editor/cme/config.py
-lib/cinnamon-menu-editor/cme/util.py
-lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
-lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
-lib/cinnamon-settings-users/cinnamon-settings-users.py
-lib/cinnamon-settings-users/cinnamon-settings-users.svg
-lib/cinnamon-settings-users/cinnamon-settings-users.ui
-lib/cinnamon-settings/bin/ExtensionCore.py
-lib/cinnamon-settings/bin/SettingsWidgets.py
-lib/cinnamon-settings/bin/Spices.py
-lib/cinnamon-settings/bin/XletSettings.py
-lib/cinnamon-settings/bin/XletSettingsWidgets.py
-lib/cinnamon-settings/bin/__init__.py
-lib/cinnamon-settings/bin/capi.py
-lib/cinnamon-settings/bin/eyedropper.py
-lib/cinnamon-settings/bin/imtools.py
-lib/cinnamon-settings/bin/installSchema.py
-lib/cinnamon-settings/bin/proxygsettings.py
-lib/cinnamon-settings/bin/removeSchema.py
-lib/cinnamon-settings/bin/xlet-settings.ui
-lib/cinnamon-settings/cinnamon-settings-spice-progress.ui
-lib/cinnamon-settings/cinnamon-settings.py
-lib/cinnamon-settings/cinnamon-settings.ui
-lib/cinnamon-settings/data/spices/applet-detail.html
-lib/cinnamon-settings/data/spices/jquery.js
-lib/cinnamon-settings/modules/cs_applets.py
-lib/cinnamon-settings/modules/cs_backgrounds.py
-lib/cinnamon-settings/modules/cs_calendar.py
-lib/cinnamon-settings/modules/cs_default.py
-lib/cinnamon-settings/modules/cs_desklets.py
-lib/cinnamon-settings/modules/cs_desktop.py
-lib/cinnamon-settings/modules/cs_effects.py
-lib/cinnamon-settings/modules/cs_extensions.py
-lib/cinnamon-settings/modules/cs_fonts.py
-lib/cinnamon-settings/modules/cs_general.py
-lib/cinnamon-settings/modules/cs_hotcorner.py
-lib/cinnamon-settings/modules/cs_info.py
-lib/cinnamon-settings/modules/cs_keyboard.py
-lib/cinnamon-settings/modules/cs_mouse.py
-lib/cinnamon-settings/modules/cs_notifications.py
-lib/cinnamon-settings/modules/cs_panel.py
-lib/cinnamon-settings/modules/cs_power.py
-lib/cinnamon-settings/modules/cs_privacy.py
-lib/cinnamon-settings/modules/cs_screensaver.py
-lib/cinnamon-settings/modules/cs_themes.py
-lib/cinnamon-settings/modules/cs_tiling.py
-lib/cinnamon-settings/modules/cs_windows.py
-lib/cinnamon-settings/modules/cs_workspaces.py
-lib/cinnamon-slideshow/cinnamon-slideshow.py
-lib/cinnamon/libcinnamon-js.so
 lib/cinnamon/libcinnamon.so
-libexec/cinnamon/cinnamon-hotplug-sniffer
-libexec/cinnamon/cinnamon-perf-helper
-man/man1/cinnamon-extension-tool.1.gz
+lib/cinnamon/libst.so
+libexec/cinnamon-hotplug-sniffer
+libexec/cinnamon-perf-helper
 man/man1/cinnamon-launcher.1.gz
+man/man1/cinnamon-looking-glass.1.gz
 man/man1/cinnamon-menu-editor.1.gz
+man/man1/cinnamon-screensaver-lock-dialog.1.gz
 man/man1/cinnamon-settings.1.gz
 man/man1/cinnamon.1.gz
 man/man1/cinnamon2d.1.gz
 man/man1/gnome-session-cinnamon.1.gz
 man/man1/gnome-session-cinnamon2d.1.gz
+share/applications/cinnamon-killer-daemon.desktop
 share/applications/cinnamon-menu-editor.desktop
+share/applications/cinnamon-onscreen-keyboard.desktop
 share/applications/cinnamon-settings-applets.desktop
 share/applications/cinnamon-settings-backgrounds.desktop
 share/applications/cinnamon-settings-calendar.desktop
@@ -108,16 +49,20 @@ share/applications/cinnamon-settings-extensions.desktop
 share/applications/cinnamon-settings-fonts.desktop
 share/applications/cinnamon-settings-general.desktop
 share/applications/cinnamon-settings-hotcorner.desktop
-share/applications/cinnamon-settings-notifications.desktop
 share/applications/cinnamon-settings-info.desktop
 share/applications/cinnamon-settings-keyboard.desktop
 share/applications/cinnamon-settings-mouse.desktop
+share/applications/cinnamon-settings-notifications.desktop
+share/applications/cinnamon-settings-online-accounts.desktop
 share/applications/cinnamon-settings-panel.desktop
 share/applications/cinnamon-settings-power.desktop
 share/applications/cinnamon-settings-privacy.desktop
 share/applications/cinnamon-settings-screensaver.desktop
+share/applications/cinnamon-settings-sound.desktop
+share/applications/cinnamon-settings-startup.desktop
 share/applications/cinnamon-settings-themes.desktop
 share/applications/cinnamon-settings-tiling.desktop
+share/applications/cinnamon-settings-universal-access.desktop
 share/applications/cinnamon-settings-user.desktop
 share/applications/cinnamon-settings-users.desktop
 share/applications/cinnamon-settings-windows.desktop
@@ -125,531 +70,403 @@ share/applications/cinnamon-settings-workspaces.desktop
 share/applications/cinnamon-settings.desktop
 share/applications/cinnamon.desktop
 share/applications/cinnamon2d.desktop
-share/cinnamon-session/sessions/cinnamon.session
-share/cinnamon-session/sessions/cinnamon2d.session
-share/cinnamon/applets/a11y@cinnamon.org/applet.js
-share/cinnamon/applets/a11y@cinnamon.org/metadata.json
-share/cinnamon/applets/brightness@cinnamon.org/applet.js
-share/cinnamon/applets/brightness@cinnamon.org/metadata.json
-share/cinnamon/applets/calendar@cinnamon.org/applet.js
-share/cinnamon/applets/calendar@cinnamon.org/calendar.js
-share/cinnamon/applets/calendar@cinnamon.org/metadata.json
-share/cinnamon/applets/calendar@cinnamon.org/settings-schema.json
-share/cinnamon/applets/expo@cinnamon.org/applet.js
-share/cinnamon/applets/expo@cinnamon.org/cinnamon-expo-symbolic.svg
-share/cinnamon/applets/expo@cinnamon.org/icon.png
-share/cinnamon/applets/expo@cinnamon.org/metadata.json
-share/cinnamon/applets/expo@cinnamon.org/settings-schema.json
-share/cinnamon/applets/keyboard@cinnamon.org/applet.js
-share/cinnamon/applets/keyboard@cinnamon.org/flags/aa.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ad.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ae.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/af.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ag.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ai.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/al.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/am.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ao.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/aq.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ar.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ara.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/as.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/at.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/au.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/aw.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ax.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/az.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ba.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bb.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bd.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/be.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bf.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bh.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bi.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bj.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bl.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bo.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bq.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/br.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/brai.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bs.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bt.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bv.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bw.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/by.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/bz.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ca.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cc.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cd.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cf.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ch.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ci.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ck.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cl.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/co.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cu.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cv.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cw.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cx.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cy.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/cz.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/de.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/dj.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/dk.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/dm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/do.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/dz.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ec.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ee.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/eg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/eh.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/epo.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/er.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/es.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/et.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/fi.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/fj.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/fk.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/fm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/fo.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/fr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ga.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gb.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gd.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ge.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gf.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gh.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gi.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gl.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gp.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gq.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gs.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gt.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gu.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gw.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/gy.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/hk.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/hm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/hn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/hr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ht.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/hu.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/id.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ie.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/il.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/im.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/in.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/io.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/iq.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ir.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/is.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/it.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/je.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/jm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/jo.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/jp.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ke.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/kg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/kh.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ki.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/km.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/kn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/kp.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/kr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/kw.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ky.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/kz.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/la.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/lb.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/lc.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/li.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/lk.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/lr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ls.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/lt.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/lu.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/lv.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ly.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ma.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mc.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/md.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/me.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mf.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mh.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mk.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ml.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mo.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mp.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mq.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ms.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mt.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mu.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mv.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mw.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mx.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/my.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/mz.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/na.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/nc.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ne.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/nf.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ng.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ni.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/nl.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/no.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/np.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/nr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/nu.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/nz.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/om.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pa.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pe.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pf.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ph.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pk.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pl.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ps.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pt.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/pw.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/py.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/qa.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/re.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ro.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/rs.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ru.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/rw.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sa.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sb.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sc.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sd.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/se.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sh.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/si.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sj.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sk.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sl.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/so.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ss.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/st.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sv.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sx.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sy.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/sz.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tc.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/td.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tf.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/th.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tj.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tk.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tl.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/to.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tr.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tt.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tv.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tw.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/tz.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ua.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ug.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/um.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/us.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/uy.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/uz.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/va.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/vc.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ve.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/vg.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/vi.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/vn.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/vu.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/wf.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ws.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/ye.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/yt.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/za.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/zm.png
-share/cinnamon/applets/keyboard@cinnamon.org/flags/zw.png
-share/cinnamon/applets/keyboard@cinnamon.org/metadata.json
-share/cinnamon/applets/keyboard@cinnamon.org/settings-schema.json
-share/cinnamon/applets/menu@cinnamon.org/applet.js
-share/cinnamon/applets/menu@cinnamon.org/metadata.json
-share/cinnamon/applets/menu@cinnamon.org/settings-schema.json
-@comment share/cinnamon/applets/network@cinnamon.org/applet.js
-@comment share/cinnamon/applets/network@cinnamon.org/metadata.json
-share/cinnamon/applets/notifications@cinnamon.org/alt-critical-notif-symbolic.svg
-share/cinnamon/applets/notifications@cinnamon.org/applet.js
-share/cinnamon/applets/notifications@cinnamon.org/critical-notif-symbolic.svg
-share/cinnamon/applets/notifications@cinnamon.org/empty-notif-symbolic.svg
-share/cinnamon/applets/notifications@cinnamon.org/icon.svg
-share/cinnamon/applets/notifications@cinnamon.org/low-notif-symbolic.svg
-share/cinnamon/applets/notifications@cinnamon.org/metadata.json
-share/cinnamon/applets/notifications@cinnamon.org/normal-notif-symbolic.svg
-share/cinnamon/applets/notifications@cinnamon.org/settings-schema.json
-share/cinnamon/applets/panel-launchers@cinnamon.org/applet.js
-share/cinnamon/applets/panel-launchers@cinnamon.org/metadata.json
-share/cinnamon/applets/panel-launchers@cinnamon.org/settings-schema.json
-share/cinnamon/applets/power@cinnamon.org/applet.js
-share/cinnamon/applets/power@cinnamon.org/metadata.json
-share/cinnamon/applets/power@cinnamon.org/settings-schema.json
-share/cinnamon/applets/recent@cinnamon.org/applet.js
-share/cinnamon/applets/recent@cinnamon.org/metadata.json
-share/cinnamon/applets/removable-drives@cinnamon.org/applet.js
-share/cinnamon/applets/removable-drives@cinnamon.org/metadata.json
-share/cinnamon/applets/scale@cinnamon.org/applet.js
-share/cinnamon/applets/scale@cinnamon.org/cinnamon-scale-symbolic.svg
-share/cinnamon/applets/scale@cinnamon.org/icon.png
-share/cinnamon/applets/scale@cinnamon.org/metadata.json
-share/cinnamon/applets/scale@cinnamon.org/settings-schema.json
-share/cinnamon/applets/separator@cinnamon.org/applet.js
-share/cinnamon/applets/separator@cinnamon.org/metadata.json
-share/cinnamon/applets/settings-example@cinnamon.org/applet.js
-share/cinnamon/applets/settings-example@cinnamon.org/metadata.json
-share/cinnamon/applets/settings-example@cinnamon.org/settings-schema.json
-share/cinnamon/applets/settings@cinnamon.org/applet.js
-share/cinnamon/applets/settings@cinnamon.org/metadata.json
-share/cinnamon/applets/show-desktop@cinnamon.org/applet.js
-share/cinnamon/applets/show-desktop@cinnamon.org/metadata.json
-share/cinnamon/applets/slideshow@cinnamon.org/applet.js
-share/cinnamon/applets/slideshow@cinnamon.org/metadata.json
-share/cinnamon/applets/slideshow@cinnamon.org/slideshow-disabled-symbolic.svg
-share/cinnamon/applets/slideshow@cinnamon.org/slideshow-pause-symbolic.svg
-share/cinnamon/applets/slideshow@cinnamon.org/slideshow-play-symbolic.svg
-share/cinnamon/applets/sound@cinnamon.org/applet.js
-share/cinnamon/applets/sound@cinnamon.org/metadata.json
-share/cinnamon/applets/sound@cinnamon.org/settings-schema.json
-share/cinnamon/applets/spacer@cinnamon.org/applet.js
-share/cinnamon/applets/spacer@cinnamon.org/metadata.json
-share/cinnamon/applets/spacer@cinnamon.org/settings-schema.json
-share/cinnamon/applets/systray@cinnamon.org/applet.js
-share/cinnamon/applets/systray@cinnamon.org/metadata.json
-share/cinnamon/applets/trash@cinnamon.org/applet.js
-share/cinnamon/applets/trash@cinnamon.org/metadata.json
-share/cinnamon/applets/user@cinnamon.org/applet.js
-share/cinnamon/applets/user@cinnamon.org/icon.png
-share/cinnamon/applets/user@cinnamon.org/metadata.json
-share/cinnamon/applets/user@cinnamon.org/settings-schema.json
-share/cinnamon/applets/user@cinnamon.org/stylesheet.css
-share/cinnamon/applets/window-list@cinnamon.org/applet.js
-share/cinnamon/applets/window-list@cinnamon.org/metadata.json
-share/cinnamon/applets/windows-quick-list@cinnamon.org/applet.js
-share/cinnamon/applets/windows-quick-list@cinnamon.org/icon.png
-share/cinnamon/applets/windows-quick-list@cinnamon.org/metadata.json
-share/cinnamon/applets/windows-quick-list@cinnamon.org/windows-quick-list-symbolic.svg
-share/cinnamon/applets/workspace-switcher@cinnamon.org/applet.js
-share/cinnamon/applets/workspace-switcher@cinnamon.org/metadata.json
-share/cinnamon/applets/xrandr@cinnamon.org/applet.js
-share/cinnamon/applets/xrandr@cinnamon.org/metadata.json
-share/cinnamon/applets/xrandr@cinnamon.org/stylesheet.css
-share/cinnamon/bumpmaps/birdnfish.png
-share/cinnamon/bumpmaps/brick.png
-share/cinnamon/bumpmaps/fish.png
-share/cinnamon/bumpmaps/frost.png
-share/cinnamon/bumpmaps/hex.png
-share/cinnamon/bumpmaps/lizard.png
-share/cinnamon/desklets/clock@cinnamon.org/desklet.js
-share/cinnamon/desklets/clock@cinnamon.org/metadata.json
-share/cinnamon/desklets/clock@cinnamon.org/settings-schema.json
-share/cinnamon/desklets/launcher@cinnamon.org/desklet.js
-share/cinnamon/desklets/launcher@cinnamon.org/editorDialog.py
-share/cinnamon/desklets/launcher@cinnamon.org/editorDialog.ui
-share/cinnamon/desklets/launcher@cinnamon.org/metadata.json
-share/cinnamon/desklets/photoframe@cinnamon.org/README
-share/cinnamon/desklets/photoframe@cinnamon.org/desklet.js
-share/cinnamon/desklets/photoframe@cinnamon.org/icon.png
-share/cinnamon/desklets/photoframe@cinnamon.org/metadata.json
-share/cinnamon/desklets/photoframe@cinnamon.org/settings-schema.json
-share/cinnamon/desklets/photoframe@cinnamon.org/stylesheet.css
-share/cinnamon/faces/0_cars.jpg
-share/cinnamon/faces/0_chess.jpg
-share/cinnamon/faces/0_coffee.jpg
-share/cinnamon/faces/0_guitar.jpg
-share/cinnamon/faces/2_10.png
-share/cinnamon/faces/2_11.png
-share/cinnamon/faces/2_12.png
-share/cinnamon/faces/2_13.png
-share/cinnamon/faces/3_lightning.jpg
-share/cinnamon/faces/3_mountain.jpg
-share/cinnamon/faces/3_sky.jpg
-share/cinnamon/faces/3_sunset.jpg
-share/cinnamon/faces/4_cinnamon.jpg
-share/cinnamon/faces/4_flower.jpg
-share/cinnamon/faces/4_leaf.jpg
-share/cinnamon/faces/4_sunflower.jpg
-share/cinnamon/faces/5_fish.jpg
-share/cinnamon/faces/5_kitten.jpg
-share/cinnamon/faces/5_penguin.jpg
-share/cinnamon/faces/5_puppy.jpg
-share/cinnamon/faces/6_astronaut.jpg
-share/cinnamon/faces/6_butterfly.png
-share/cinnamon/faces/6_flake.jpg
-share/cinnamon/faces/6_grapes.jpg
-share/cinnamon/faces/7_bat.png
-share/cinnamon/faces/7_dog.png
-share/cinnamon/faces/7_elephant.png
-share/cinnamon/faces/7_fox.png
-share/cinnamon/faces/7_lion.png
-share/cinnamon/faces/7_panda.png
-share/cinnamon/faces/7_penguin.png
-share/cinnamon/faces/7_tucan.png
-share/cinnamon/faces/user-generic.png
-share/cinnamon/icons/move-symbolic.svg
-share/cinnamon/js/misc/config.js
-share/cinnamon/js/misc/docInfo.js
-share/cinnamon/js/misc/fileUtils.js
-share/cinnamon/js/misc/format.js
-share/cinnamon/js/misc/gnomeSession.js
-share/cinnamon/js/misc/gridNavigator.js
-share/cinnamon/js/misc/history.js
-share/cinnamon/js/misc/interfaces.js
-share/cinnamon/js/misc/modemManager.js
-share/cinnamon/js/misc/params.js
-share/cinnamon/js/misc/pointerTracker.js
-share/cinnamon/js/misc/screenSaver.js
-share/cinnamon/js/misc/timers.js
-share/cinnamon/js/misc/util.js
-share/cinnamon/js/misc/windowUtils.js
-share/cinnamon/js/perf/core.js
-share/cinnamon/js/ui/appFavorites.js
-share/cinnamon/js/ui/appSwitcher/appSwitcher.js
-share/cinnamon/js/ui/appSwitcher/appSwitcher3D.js
-share/cinnamon/js/ui/appSwitcher/classicSwitcher.js
-share/cinnamon/js/ui/appSwitcher/coverflowSwitcher.js
-share/cinnamon/js/ui/appSwitcher/timelineSwitcher.js
-share/cinnamon/js/ui/applet.js
-share/cinnamon/js/ui/appletManager.js
-share/cinnamon/js/ui/backgroundManager.js
-share/cinnamon/js/ui/boxpointer.js
-share/cinnamon/js/ui/checkBox.js
-share/cinnamon/js/ui/cinnamonDBus.js
-share/cinnamon/js/ui/cinnamonEntry.js
-share/cinnamon/js/ui/cinnamonMountOperation.js
-share/cinnamon/js/ui/desklet.js
-share/cinnamon/js/ui/deskletManager.js
-share/cinnamon/js/ui/dnd.js
-share/cinnamon/js/ui/edgeFlip.js
-share/cinnamon/js/ui/environment.js
-share/cinnamon/js/ui/expo.js
-share/cinnamon/js/ui/expoThumbnail.js
-share/cinnamon/js/ui/extension.js
-share/cinnamon/js/ui/extensionSystem.js
-share/cinnamon/js/ui/flashspot.js
-share/cinnamon/js/ui/hotCorner.js
-share/cinnamon/js/ui/keybindings.js
-share/cinnamon/js/ui/keyboard.js
-share/cinnamon/js/ui/layout.js
-share/cinnamon/js/ui/lightbox.js
-share/cinnamon/js/ui/link.js
-share/cinnamon/js/ui/lookingGlass.js
-share/cinnamon/js/ui/lookingGlassDBus.js
-share/cinnamon/js/ui/magnifier.js
-share/cinnamon/js/ui/magnifierDBus.js
-share/cinnamon/js/ui/main.js
-share/cinnamon/js/ui/messageTray.js
-share/cinnamon/js/ui/modalDialog.js
-share/cinnamon/js/ui/notificationDaemon.js
-share/cinnamon/js/ui/overrides.js
-share/cinnamon/js/ui/overview.js
-share/cinnamon/js/ui/panel.js
-share/cinnamon/js/ui/panelMenu.js
-share/cinnamon/js/ui/placesManager.js
-share/cinnamon/js/ui/popupMenu.js
-share/cinnamon/js/ui/radioButton.js
-share/cinnamon/js/ui/runDialog.js
-share/cinnamon/js/ui/scripting.js
-share/cinnamon/js/ui/search.js
-share/cinnamon/js/ui/settings.js
-share/cinnamon/js/ui/slideshowManager.js
-share/cinnamon/js/ui/soundManager.js
-share/cinnamon/js/ui/statusIconDispatcher.js
-share/cinnamon/js/ui/systray.js
-share/cinnamon/js/ui/themeManager.js
-share/cinnamon/js/ui/tooltips.js
-share/cinnamon/js/ui/tweener.js
-share/cinnamon/js/ui/windowAttentionHandler.js
-share/cinnamon/js/ui/windowManager.js
-share/cinnamon/js/ui/workspace.js
-share/cinnamon/js/ui/workspacesView.js
-share/cinnamon/js/ui/xdndHandler.js
-share/cinnamon/search_providers/google.xml
-share/cinnamon/search_providers/wikipedia.xml
-share/cinnamon/theme/add-workspace-hover.png
-share/cinnamon/theme/add-workspace.png
-share/cinnamon/theme/calendar-arrow-left.svg
-share/cinnamon/theme/calendar-arrow-right.svg
-share/cinnamon/theme/calendar-today.svg
-share/cinnamon/theme/checkbox-focused.svg
-share/cinnamon/theme/checkbox-off-focused.svg
-share/cinnamon/theme/checkbox-off.svg
-share/cinnamon/theme/checkbox.svg
-share/cinnamon/theme/cinnamon.css
-share/cinnamon/theme/close-window.svg
-share/cinnamon/theme/close.svg
-share/cinnamon/theme/corner-ripple.png
-share/cinnamon/theme/menu-symbolic.svg
-share/cinnamon/theme/overview-hover.png
-share/cinnamon/theme/overview.png
-share/cinnamon/theme/player-paused.svg
-share/cinnamon/theme/player-playing.svg
-share/cinnamon/theme/player-stopped.svg
-share/cinnamon/theme/process-working.svg
-share/cinnamon/theme/radiobutton-off.svg
-share/cinnamon/theme/radiobutton.svg
-share/cinnamon/theme/scroll-hhandle.svg
-share/cinnamon/theme/scroll-vhandle.svg
-share/cinnamon/theme/thumbnail-generic.png
-share/cinnamon/theme/thumbnail.png
-share/cinnamon/theme/toggle-off-intl.svg
-share/cinnamon/theme/toggle-off-us.svg
-share/cinnamon/theme/toggle-on-intl.svg
-share/cinnamon/theme/toggle-on-us.svg
-share/cinnamon/theme/trash-icon.png
-share/cinnamon/thumbnails/cinnamon/unknown.png
-share/cinnamon/thumbnails/cursors/Adwaita.png
-share/cinnamon/thumbnails/cursors/DMZ-Black.png
-share/cinnamon/thumbnails/cursors/DMZ-White.png
-share/cinnamon/thumbnails/cursors/unknown.png
-share/cinnamon/thumbnails/gtk-3.0/Adwaita.png
-share/cinnamon/thumbnails/gtk-3.0/Box.png
-share/cinnamon/thumbnails/gtk-3.0/HighContrast.png
-share/cinnamon/thumbnails/gtk-3.0/README
-share/cinnamon/thumbnails/gtk-3.0/unknown.png
-share/cinnamon/thumbnails/metacity-1/Adwaita.png
-share/cinnamon/thumbnails/metacity-1/AgingGorilla.png
-share/cinnamon/thumbnails/metacity-1/Atlanta.png
-share/cinnamon/thumbnails/metacity-1/Box.png
-share/cinnamon/thumbnails/metacity-1/Bright.png
-share/cinnamon/thumbnails/metacity-1/Crux.png
-share/cinnamon/thumbnails/metacity-1/Esco.png
-share/cinnamon/thumbnails/metacity-1/HighContrast.png
-share/cinnamon/thumbnails/metacity-1/Metabox.png
-share/cinnamon/thumbnails/metacity-1/README
-share/cinnamon/thumbnails/metacity-1/Simple.png
-share/cinnamon/thumbnails/metacity-1/unknown.png
+%%DATADIR%%-background-properties/adwaita.xml
+%%DATADIR%%-background-properties/gnome-backgrounds.xml
+%%DATADIR%%-session/sessions/cinnamon.session
+%%DATADIR%%-session/sessions/cinnamon2d.session
+%%DATADIR%%/applets/a11y@cinnamon.org/applet.js
+%%DATADIR%%/applets/a11y@cinnamon.org/metadata.json
+%%DATADIR%%/applets/calendar@cinnamon.org/applet.js
+%%DATADIR%%/applets/calendar@cinnamon.org/calendar.js
+%%DATADIR%%/applets/calendar@cinnamon.org/metadata.json
+%%DATADIR%%/applets/calendar@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/expo@cinnamon.org/applet.js
+%%DATADIR%%/applets/expo@cinnamon.org/icons/cinnamon-expo-symbolic.svg
+%%DATADIR%%/applets/expo@cinnamon.org/metadata.json
+%%DATADIR%%/applets/expo@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/favorites@cinnamon.org/applet.js
+%%DATADIR%%/applets/favorites@cinnamon.org/metadata.json
+%%DATADIR%%/applets/favorites@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/appGroup.js
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/appList.js
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/applet.js
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/constants.js
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/news-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/pin-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/screenshot-area-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/screenshot-fullscreen-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/screenshot-window-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/store-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/unpin-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/view-private-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/window-new-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/x-office-database-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/x-office-math-symbolic.svg
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/menus.js
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/metadata.json
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/utils.py
+%%DATADIR%%/applets/inhibit@cinnamon.org/applet.js
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-active-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/metadata.json
+%%DATADIR%%/applets/keyboard@cinnamon.org/applet.js
+%%DATADIR%%/applets/keyboard@cinnamon.org/metadata.json
+%%DATADIR%%/applets/menu@cinnamon.org/appUtils.js
+%%DATADIR%%/applets/menu@cinnamon.org/applet.js
+%%DATADIR%%/applets/menu@cinnamon.org/metadata.json
+%%DATADIR%%/applets/menu@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/network@cinnamon.org/applet.js
+%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-excellent-secure-symbolic.svg
+%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-good-secure-symbolic.svg
+%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-none-secure-symbolic.svg
+%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-ok-secure-symbolic.svg
+%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-weak-secure-symbolic.svg
+%%DATADIR%%/applets/network@cinnamon.org/metadata.json
+%%DATADIR%%/applets/network@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/notifications@cinnamon.org/applet.js
+%%DATADIR%%/applets/notifications@cinnamon.org/icons/alt-critical-notif-symbolic.svg
+%%DATADIR%%/applets/notifications@cinnamon.org/icons/critical-notif-symbolic.svg
+%%DATADIR%%/applets/notifications@cinnamon.org/icons/empty-notif-symbolic.svg
+%%DATADIR%%/applets/notifications@cinnamon.org/icons/low-notif-symbolic.svg
+%%DATADIR%%/applets/notifications@cinnamon.org/icons/normal-notif-symbolic.svg
+%%DATADIR%%/applets/notifications@cinnamon.org/metadata.json
+%%DATADIR%%/applets/notifications@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/on-screen-keyboard@cinnamon.org/applet.js
+%%DATADIR%%/applets/on-screen-keyboard@cinnamon.org/icons/on-screen-keyboard-disabled-symbolic.svg
+%%DATADIR%%/applets/on-screen-keyboard@cinnamon.org/icons/on-screen-keyboard-symbolic.svg
+%%DATADIR%%/applets/on-screen-keyboard@cinnamon.org/metadata.json
+%%DATADIR%%/applets/panel-launchers@cinnamon.org/applet.js
+%%DATADIR%%/applets/panel-launchers@cinnamon.org/metadata.json
+%%DATADIR%%/applets/panel-launchers@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/power@cinnamon.org/applet.js
+%%DATADIR%%/applets/power@cinnamon.org/metadata.json
+%%DATADIR%%/applets/power@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/printers@cinnamon.org/applet.js
+%%DATADIR%%/applets/printers@cinnamon.org/cancel-print-dialog.py
+%%DATADIR%%/applets/printers@cinnamon.org/lpstat-a.py
+%%DATADIR%%/applets/printers@cinnamon.org/metadata.json
+%%DATADIR%%/applets/printers@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/recent@cinnamon.org/applet.js
+%%DATADIR%%/applets/recent@cinnamon.org/metadata.json
+%%DATADIR%%/applets/removable-drives@cinnamon.org/applet.js
+%%DATADIR%%/applets/removable-drives@cinnamon.org/metadata.json
+%%DATADIR%%/applets/scale@cinnamon.org/applet.js
+%%DATADIR%%/applets/scale@cinnamon.org/icons/cinnamon-scale-symbolic.svg
+%%DATADIR%%/applets/scale@cinnamon.org/metadata.json
+%%DATADIR%%/applets/scale@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/separator@cinnamon.org/applet.js
+%%DATADIR%%/applets/separator@cinnamon.org/metadata.json
+%%DATADIR%%/applets/settings-example@cinnamon.org/CustomWidget.py
+%%DATADIR%%/applets/settings-example@cinnamon.org/applet.js
+%%DATADIR%%/applets/settings-example@cinnamon.org/metadata.json
+%%DATADIR%%/applets/settings-example@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/settings@cinnamon.org/applet.js
+%%DATADIR%%/applets/settings@cinnamon.org/metadata.json
+%%DATADIR%%/applets/show-desktop@cinnamon.org/applet.js
+%%DATADIR%%/applets/show-desktop@cinnamon.org/metadata.json
+%%DATADIR%%/applets/show-desktop@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/slideshow@cinnamon.org/applet.js
+%%DATADIR%%/applets/slideshow@cinnamon.org/icons/slideshow-disabled-symbolic.svg
+%%DATADIR%%/applets/slideshow@cinnamon.org/icons/slideshow-pause-symbolic.svg
+%%DATADIR%%/applets/slideshow@cinnamon.org/icons/slideshow-play-symbolic.svg
+%%DATADIR%%/applets/slideshow@cinnamon.org/metadata.json
+%%DATADIR%%/applets/sound@cinnamon.org/applet.js
+%%DATADIR%%/applets/sound@cinnamon.org/metadata.json
+%%DATADIR%%/applets/sound@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/spacer@cinnamon.org/applet.js
+%%DATADIR%%/applets/spacer@cinnamon.org/metadata.json
+%%DATADIR%%/applets/spacer@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/systray@cinnamon.org/applet.js
+%%DATADIR%%/applets/systray@cinnamon.org/metadata.json
+%%DATADIR%%/applets/trash@cinnamon.org/applet.js
+%%DATADIR%%/applets/trash@cinnamon.org/metadata.json
+%%DATADIR%%/applets/user@cinnamon.org/applet.js
+%%DATADIR%%/applets/user@cinnamon.org/icons/logout-symbolic.svg
+%%DATADIR%%/applets/user@cinnamon.org/icons/switch-user-symbolic.svg
+%%DATADIR%%/applets/user@cinnamon.org/metadata.json
+%%DATADIR%%/applets/user@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/user@cinnamon.org/stylesheet.css
+%%DATADIR%%/applets/window-list@cinnamon.org/applet.js
+%%DATADIR%%/applets/window-list@cinnamon.org/metadata.json
+%%DATADIR%%/applets/window-list@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/windows-quick-list@cinnamon.org/applet.js
+%%DATADIR%%/applets/windows-quick-list@cinnamon.org/icons/windows-quick-list-symbolic.svg
+%%DATADIR%%/applets/windows-quick-list@cinnamon.org/metadata.json
+%%DATADIR%%/applets/workspace-switcher@cinnamon.org/applet.js
+%%DATADIR%%/applets/workspace-switcher@cinnamon.org/metadata.json
+%%DATADIR%%/applets/workspace-switcher@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/xapp-status@cinnamon.org/applet.js
+%%DATADIR%%/applets/xapp-status@cinnamon.org/metadata.json
+%%DATADIR%%/applets/xrandr@cinnamon.org/applet.js
+%%DATADIR%%/applets/xrandr@cinnamon.org/metadata.json
+%%DATADIR%%/applets/xrandr@cinnamon.org/stylesheet.css
+%%DATADIR%%/bumpmaps/birdnfish.png
+%%DATADIR%%/bumpmaps/brick.png
+%%DATADIR%%/bumpmaps/fish.png
+%%DATADIR%%/bumpmaps/frost.png
+%%DATADIR%%/bumpmaps/hex.png
+%%DATADIR%%/bumpmaps/lizard.png
+%%DATADIR%%/cinnamon-dbus-command
+%%DATADIR%%/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+%%DATADIR%%/cinnamon-desktop-editor/directory-editor.ui
+%%DATADIR%%/cinnamon-desktop-editor/launcher-editor.ui
+%%DATADIR%%/cinnamon-looking-glass/cinnamon-looking-glass.py
+%%DATADIR%%/cinnamon-looking-glass/lookingglass_proxy.py
+%%DATADIR%%/cinnamon-looking-glass/page_extensions.py
+%%DATADIR%%/cinnamon-looking-glass/page_inspect.py
+%%DATADIR%%/cinnamon-looking-glass/page_log.py
+%%DATADIR%%/cinnamon-looking-glass/page_results.py
+%%DATADIR%%/cinnamon-looking-glass/page_windows.py
+%%DATADIR%%/cinnamon-looking-glass/pageutils.py
+%%DATADIR%%/cinnamon-menu-editor/cinnamon-menu-editor.ui
+%%DATADIR%%/cinnamon-menu-editor/cme/MainWindow.py
+%%DATADIR%%/cinnamon-menu-editor/cme/MenuEditor.py
+%%DATADIR%%/cinnamon-menu-editor/cme/__init__.py
+%%DATADIR%%/cinnamon-menu-editor/cme/config.py
+%%DATADIR%%/cinnamon-menu-editor/cme/util.py
+%%DATADIR%%/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+%%DATADIR%%/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
+%%DATADIR%%/cinnamon-settings-users/cinnamon-settings-users.py
+%%DATADIR%%/cinnamon-settings-users/cinnamon-settings-users.svg
+%%DATADIR%%/cinnamon-settings-users/cinnamon-settings-users.ui
+%%DATADIR%%/cinnamon-settings/bin/ChooserButtonWidgets.py
+%%DATADIR%%/cinnamon-settings/bin/CinnamonGtkSettings.py
+%%DATADIR%%/cinnamon-settings/bin/ExtensionCore.py
+%%DATADIR%%/cinnamon-settings/bin/JsonSettingsWidgets.py
+%%DATADIR%%/cinnamon-settings/bin/KeybindingWidgets.py
+%%DATADIR%%/cinnamon-settings/bin/SettingsWidgets.py
+%%DATADIR%%/cinnamon-settings/bin/Spices.py
+%%DATADIR%%/cinnamon-settings/bin/TreeListWidgets.py
+%%DATADIR%%/cinnamon-settings/bin/__init__.py
+%%DATADIR%%/cinnamon-settings/bin/capi.py
+%%DATADIR%%/cinnamon-settings/bin/eyedropper.py
+%%DATADIR%%/cinnamon-settings/bin/imtools.py
+%%DATADIR%%/cinnamon-settings/bin/proxygsettings.py
+%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.glade
+%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.py
+%%DATADIR%%/cinnamon-settings/bin/tweenEquations.py
+%%DATADIR%%/cinnamon-settings/cinnamon-online-accounts-info.ui
+%%DATADIR%%/cinnamon-settings/cinnamon-settings.py
+%%DATADIR%%/cinnamon-settings/cinnamon-settings.ui
+%%DATADIR%%/cinnamon-settings/config.py
+%%DATADIR%%/cinnamon-settings/icons
+%%DATADIR%%/cinnamon-settings/modules/cs_accessibility.py
+%%DATADIR%%/cinnamon-settings/modules/cs_applets.py
+%%DATADIR%%/cinnamon-settings/modules/cs_backgrounds.py
+%%DATADIR%%/cinnamon-settings/modules/cs_calendar.py
+%%DATADIR%%/cinnamon-settings/modules/cs_default.py
+%%DATADIR%%/cinnamon-settings/modules/cs_desklets.py
+%%DATADIR%%/cinnamon-settings/modules/cs_desktop.py
+%%DATADIR%%/cinnamon-settings/modules/cs_display.py
+%%DATADIR%%/cinnamon-settings/modules/cs_effects.py
+%%DATADIR%%/cinnamon-settings/modules/cs_extensions.py
+%%DATADIR%%/cinnamon-settings/modules/cs_fonts.py
+%%DATADIR%%/cinnamon-settings/modules/cs_general.py
+%%DATADIR%%/cinnamon-settings/modules/cs_hotcorner.py
+%%DATADIR%%/cinnamon-settings/modules/cs_info.py
+%%DATADIR%%/cinnamon-settings/modules/cs_keyboard.py
+%%DATADIR%%/cinnamon-settings/modules/cs_mouse.py
+%%DATADIR%%/cinnamon-settings/modules/cs_notifications.py
+%%DATADIR%%/cinnamon-settings/modules/cs_online_accounts.py
+%%DATADIR%%/cinnamon-settings/modules/cs_panel.py
+%%DATADIR%%/cinnamon-settings/modules/cs_power.py
+%%DATADIR%%/cinnamon-settings/modules/cs_privacy.py
+%%DATADIR%%/cinnamon-settings/modules/cs_screensaver.py
+%%DATADIR%%/cinnamon-settings/modules/cs_sound.py
+%%DATADIR%%/cinnamon-settings/modules/cs_startup.py
+%%DATADIR%%/cinnamon-settings/modules/cs_themes.py
+%%DATADIR%%/cinnamon-settings/modules/cs_tiling.py
+%%DATADIR%%/cinnamon-settings/modules/cs_user.py
+%%DATADIR%%/cinnamon-settings/modules/cs_windows.py
+%%DATADIR%%/cinnamon-settings/modules/cs_workspaces.py
+%%DATADIR%%/cinnamon-settings/xlet-settings.py
+%%DATADIR%%/cinnamon-slideshow/cinnamon-slideshow.py
+%%DATADIR%%/desklets/clock@cinnamon.org/desklet.js
+%%DATADIR%%/desklets/clock@cinnamon.org/metadata.json
+%%DATADIR%%/desklets/clock@cinnamon.org/settings-schema.json
+%%DATADIR%%/desklets/launcher@cinnamon.org/desklet.js
+%%DATADIR%%/desklets/launcher@cinnamon.org/editorDialog.py
+%%DATADIR%%/desklets/launcher@cinnamon.org/editorDialog.ui
+%%DATADIR%%/desklets/launcher@cinnamon.org/metadata.json
+%%DATADIR%%/desklets/photoframe@cinnamon.org/desklet.js
+%%DATADIR%%/desklets/photoframe@cinnamon.org/icon.png
+%%DATADIR%%/desklets/photoframe@cinnamon.org/metadata.json
+%%DATADIR%%/desklets/photoframe@cinnamon.org/settings-schema.json
+%%DATADIR%%/desklets/photoframe@cinnamon.org/stylesheet.css
+%%DATADIR%%/faces/0_cars.jpg
+%%DATADIR%%/faces/0_chess.jpg
+%%DATADIR%%/faces/0_coffee.jpg
+%%DATADIR%%/faces/0_guitar.jpg
+%%DATADIR%%/faces/2_10.png
+%%DATADIR%%/faces/2_11.png
+%%DATADIR%%/faces/2_12.png
+%%DATADIR%%/faces/2_13.png
+%%DATADIR%%/faces/3_lightning.jpg
+%%DATADIR%%/faces/3_mountain.jpg
+%%DATADIR%%/faces/3_sky.jpg
+%%DATADIR%%/faces/3_sunset.jpg
+%%DATADIR%%/faces/4_cinnamon.jpg
+%%DATADIR%%/faces/4_flower.jpg
+%%DATADIR%%/faces/4_leaf.jpg
+%%DATADIR%%/faces/4_sunflower.jpg
+%%DATADIR%%/faces/5_fish.jpg
+%%DATADIR%%/faces/5_kitten.jpg
+%%DATADIR%%/faces/5_penguin.jpg
+%%DATADIR%%/faces/5_puppy.jpg
+%%DATADIR%%/faces/6_astronaut.jpg
+%%DATADIR%%/faces/6_butterfly.png
+%%DATADIR%%/faces/6_flake.jpg
+%%DATADIR%%/faces/6_grapes.jpg
+%%DATADIR%%/faces/7_bat.png
+%%DATADIR%%/faces/7_dog.png
+%%DATADIR%%/faces/7_elephant.png
+%%DATADIR%%/faces/7_fox.png
+%%DATADIR%%/faces/7_lion.png
+%%DATADIR%%/faces/7_panda.png
+%%DATADIR%%/faces/7_penguin.png
+%%DATADIR%%/faces/7_tucan.png
+%%DATADIR%%/faces/user-generic.png
+%%DATADIR%%/icons/move-symbolic.svg
+%%DATADIR%%/js/misc/config.js
+%%DATADIR%%/js/misc/docInfo.js
+%%DATADIR%%/js/misc/fileDialog.js
+%%DATADIR%%/js/misc/fileUtils.js
+%%DATADIR%%/js/misc/gnomeSession.js
+%%DATADIR%%/js/misc/gridNavigator.js
+%%DATADIR%%/js/misc/history.js
+%%DATADIR%%/js/misc/interfaces.js
+%%DATADIR%%/js/misc/modemManager.js
+%%DATADIR%%/js/misc/params.js
+%%DATADIR%%/js/misc/pointerTracker.js
+%%DATADIR%%/js/misc/screenSaver.js
+%%DATADIR%%/js/misc/signalManager.js
+%%DATADIR%%/js/misc/state.js
+%%DATADIR%%/js/misc/timers.js
+%%DATADIR%%/js/misc/util.js
+%%DATADIR%%/js/misc/windowUtils.js
+%%DATADIR%%/js/perf/core.js
+%%DATADIR%%/js/ui/accessibility.js
+%%DATADIR%%/js/ui/appFavorites.js
+%%DATADIR%%/js/ui/appSwitcher/appSwitcher.js
+%%DATADIR%%/js/ui/appSwitcher/appSwitcher3D.js
+%%DATADIR%%/js/ui/appSwitcher/classicSwitcher.js
+%%DATADIR%%/js/ui/appSwitcher/coverflowSwitcher.js
+%%DATADIR%%/js/ui/appSwitcher/timelineSwitcher.js
+%%DATADIR%%/js/ui/applet.js
+%%DATADIR%%/js/ui/appletManager.js
+%%DATADIR%%/js/ui/backgroundManager.js
+%%DATADIR%%/js/ui/boxpointer.js
+%%DATADIR%%/js/ui/checkBox.js
+%%DATADIR%%/js/ui/cinnamonDBus.js
+%%DATADIR%%/js/ui/cinnamonEntry.js
+%%DATADIR%%/js/ui/dbusMenu.js
+%%DATADIR%%/js/ui/desklet.js
+%%DATADIR%%/js/ui/deskletManager.js
+%%DATADIR%%/js/ui/dnd.js
+%%DATADIR%%/js/ui/edgeFlip.js
+%%DATADIR%%/js/ui/environment.js
+%%DATADIR%%/js/ui/expo.js
+%%DATADIR%%/js/ui/expoThumbnail.js
+%%DATADIR%%/js/ui/extension.js
+%%DATADIR%%/js/ui/extensionSystem.js
+%%DATADIR%%/js/ui/flashspot.js
+%%DATADIR%%/js/ui/hotCorner.js
+%%DATADIR%%/js/ui/keybindings.js
+%%DATADIR%%/js/ui/keyboard.js
+%%DATADIR%%/js/ui/layout.js
+%%DATADIR%%/js/ui/lightbox.js
+%%DATADIR%%/js/ui/lookingGlass.js
+%%DATADIR%%/js/ui/magnifier.js
+%%DATADIR%%/js/ui/magnifierDBus.js
+%%DATADIR%%/js/ui/main.js
+%%DATADIR%%/js/ui/messageTray.js
+%%DATADIR%%/js/ui/modalDialog.js
+%%DATADIR%%/js/ui/notificationDaemon.js
+%%DATADIR%%/js/ui/osdWindow.js
+%%DATADIR%%/js/ui/overrides.js
+%%DATADIR%%/js/ui/overview.js
+%%DATADIR%%/js/ui/panel.js
+%%DATADIR%%/js/ui/placesManager.js
+%%DATADIR%%/js/ui/popupMenu.js
+%%DATADIR%%/js/ui/radioButton.js
+%%DATADIR%%/js/ui/runDialog.js
+%%DATADIR%%/js/ui/search.js
+%%DATADIR%%/js/ui/searchProviderManager.js
+%%DATADIR%%/js/ui/separator.js
+%%DATADIR%%/js/ui/settings.js
+%%DATADIR%%/js/ui/slider.js
+%%DATADIR%%/js/ui/slideshowManager.js
+%%DATADIR%%/js/ui/soundManager.js
+%%DATADIR%%/js/ui/startupAnimation.js
+%%DATADIR%%/js/ui/statusIconDispatcher.js
+%%DATADIR%%/js/ui/systray.js
+%%DATADIR%%/js/ui/themeManager.js
+%%DATADIR%%/js/ui/tooltips.js
+%%DATADIR%%/js/ui/tweener.js
+%%DATADIR%%/js/ui/windowAttentionHandler.js
+%%DATADIR%%/js/ui/windowEffects.js
+%%DATADIR%%/js/ui/windowManager.js
+%%DATADIR%%/js/ui/workspace.js
+%%DATADIR%%/js/ui/workspacesView.js
+%%DATADIR%%/js/ui/xdndHandler.js
+%%DATADIR%%/search_providers/google.xml
+%%DATADIR%%/search_providers/wikipedia.xml
+%%DATADIR%%/sounds/bell.ogg
+%%DATADIR%%/sounds/togglekeys-sound-off.ogg
+%%DATADIR%%/sounds/togglekeys-sound-on.ogg
+%%DATADIR%%/theme/add-workspace-hover.png
+%%DATADIR%%/theme/add-workspace.png
+%%DATADIR%%/theme/calendar-arrow-left.svg
+%%DATADIR%%/theme/calendar-arrow-right.svg
+%%DATADIR%%/theme/calendar-today.svg
+%%DATADIR%%/theme/checkbox-off.svg
+%%DATADIR%%/theme/checkbox.svg
+%%DATADIR%%/theme/cinnamon.css
+%%DATADIR%%/theme/close-window-hover.svg
+%%DATADIR%%/theme/close-window.svg
+%%DATADIR%%/theme/close.svg
+%%DATADIR%%/theme/corner-ripple.png
+%%DATADIR%%/theme/menu-symbolic.svg
+%%DATADIR%%/theme/overview-hover.png
+%%DATADIR%%/theme/overview.png
+%%DATADIR%%/theme/process-working.svg
+%%DATADIR%%/theme/radiobutton-off.svg
+%%DATADIR%%/theme/radiobutton.svg
+%%DATADIR%%/theme/scroll-hhandle.svg
+%%DATADIR%%/theme/scroll-vhandle.svg
+%%DATADIR%%/theme/thumbnail-generic.png
+%%DATADIR%%/theme/thumbnail.png
+%%DATADIR%%/theme/toggle-off-intl.svg
+%%DATADIR%%/theme/toggle-off-us.svg
+%%DATADIR%%/theme/toggle-on-intl.svg
+%%DATADIR%%/theme/toggle-on-us.svg
+%%DATADIR%%/theme/trash-icon.png
+%%DATADIR%%/thumbnails/cinnamon/unknown.png
+%%DATADIR%%/thumbnails/cursors/Adwaita.png
+%%DATADIR%%/thumbnails/cursors/DMZ-Black.png
+%%DATADIR%%/thumbnails/cursors/DMZ-White.png
+%%DATADIR%%/thumbnails/cursors/unknown.png
+%%DATADIR%%/thumbnails/gtk-3.0/Adwaita-dark.png
+%%DATADIR%%/thumbnails/gtk-3.0/Adwaita.png
+%%DATADIR%%/thumbnails/gtk-3.0/Box.png
+%%DATADIR%%/thumbnails/gtk-3.0/HighContrast.png
+%%DATADIR%%/thumbnails/gtk-3.0/README
+%%DATADIR%%/thumbnails/gtk-3.0/unknown.png
+%%DATADIR%%/thumbnails/metacity-1/Adwaita-dark.png
+%%DATADIR%%/thumbnails/metacity-1/Adwaita.png
+%%DATADIR%%/thumbnails/metacity-1/AgingGorilla.png
+%%DATADIR%%/thumbnails/metacity-1/Atlanta.png
+%%DATADIR%%/thumbnails/metacity-1/Box.png
+%%DATADIR%%/thumbnails/metacity-1/Bright.png
+%%DATADIR%%/thumbnails/metacity-1/Crux.png
+%%DATADIR%%/thumbnails/metacity-1/Esco.png
+%%DATADIR%%/thumbnails/metacity-1/HighContrast.png
+%%DATADIR%%/thumbnails/metacity-1/Metabox.png
+%%DATADIR%%/thumbnails/metacity-1/README
+%%DATADIR%%/thumbnails/metacity-1/Simple.png
+%%DATADIR%%/thumbnails/metacity-1/unknown.png
+%%DATADIR%%/thumbnails/wallclock.png
 share/dbus-1/services/org.Cinnamon.HotplugSniffer.service
 share/dbus-1/services/org.Cinnamon.Melange.service
 share/dbus-1/services/org.Cinnamon.Slideshow.service
@@ -674,12 +491,208 @@ share/desktop-directories/cinnamon-system-tools.directory
 share/desktop-directories/cinnamon-system.directory
 share/desktop-directories/cinnamon-utility-accessibility.directory
 share/desktop-directories/cinnamon-utility.directory
-share/polkit-1/actions/org.cinnamon.settings-users.policy
-share/xsessions/cinnamon.desktop
-share/xsessions/cinnamon2d.desktop
-share/icons/hicolor/16x16/categories/cs-backgrounds.svg
-share/icons/hicolor/16x16/categories/cs-desklets.svg
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-docInfo-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-docInfo.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-SignalManager.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-state-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-state.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-Applet.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-AppletContextMenu.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-AppletPopupMenu.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-IconApplet.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-MenuItem.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextApplet.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextIconApplet.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-boxpointer-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-boxpointer.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-DBusClient.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-DbusMenuItem.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-PropertyStore.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-desklet-Desklet.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-desklet-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-deskletManager-DeskletContainer.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-deskletManager-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-deskletManager.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dnd-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dnd.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-extension-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-extension.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-layout-LayoutManager.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-layout-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-lightbox-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-lightbox.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-magnifierDBus-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-magnifierDBus.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-main-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-main.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-messageTray-Notification.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-messageTray-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-ConfirmDialog.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-InfoOSD.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-ModalDialog.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-NotifyDialog.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-Panel.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-PanelDummy.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-PanelManager.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupIconMenuItem.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupIndicatorMenuItem.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenu.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuAbstractItem.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuBase.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuFactory.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuSection.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupSubMenu.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-runDialog-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-runDialog.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-search-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-search.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-AppletSettings.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-DeskletSettings.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-ExtensionSettings.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-XletSettingsBase.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-PanelItemTooltip.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-Tooltip.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-TooltipBase.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tweener-ClutterFrameTicker.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tweener-section.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tweener.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/home.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/index.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/left.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/pt01.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/pt02.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/right.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/style.css
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/up.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StBin.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StBoxLayout.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StButton.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StDrawingArea.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StEntry.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StIcon.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StLabel.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StScrollView.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StScrollable.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StTable.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StTextureCache.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StWidget.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StWidgetAccessible.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/base.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/cinnamon-st-st-theme-context.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/cinnamon-st-st-theme-node.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/cinnamon-st-st-theme.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/cinnamon-st.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/containers.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/deprecated-api-index.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/home.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/index.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/left.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/object-tree.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/pt01.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/right.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/style.css
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/styling.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/up.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/widgets.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/building.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/cinnamon-tutorials.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/cjs.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/documentation.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/documenting-source.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/documenting-tutorial.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/extension-system.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/home.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/importer.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/index.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/left.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/right.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/settings.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/style.css
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/up.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/using-documentation.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/write-applet.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/xlet-settings-ref.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/xlet-settings.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/xlet-translating.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/xlet-versioning.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonApp.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonAppSystem.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonEmbeddedWindow.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonGenericContainer.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonGlobal.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonGtkEmbed.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonSlicer.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonStack.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonTrayIcon.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonTrayManager.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonWM.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonWindowTracker.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch02.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch03.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch04.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch05.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch06.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-recorder.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-util.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/deprecated-api-index.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/home.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/index.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/left.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/object-tree.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/right.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/style.css
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cinnamon/up.png
+share/icons/hicolor/scalable/actions/caps-lock-off-symbolic.svg
+share/icons/hicolor/scalable/actions/caps-lock-symbolic.svg
+share/icons/hicolor/scalable/actions/list-edit-symbolic.svg
+share/icons/hicolor/scalable/actions/num-lock-off-symbolic.svg
+share/icons/hicolor/scalable/actions/num-lock-symbolic.svg
+share/icons/hicolor/scalable/actions/pan-down-symbolic.svg
+share/icons/hicolor/scalable/actions/pan-end-symbolic-rtl.svg
+share/icons/hicolor/scalable/actions/pan-end-symbolic.svg
+share/icons/hicolor/scalable/actions/pan-start-symbolic-rtl.svg
+share/icons/hicolor/scalable/actions/pan-start-symbolic.svg
+share/icons/hicolor/scalable/actions/pan-up-symbolic.svg
+share/icons/hicolor/scalable/apps/cinnamon-panel-launcher.svg
+share/icons/hicolor/scalable/apps/cinnamon-symbolic.svg
+share/icons/hicolor/scalable/apps/cinnamon-virtual-keyboard.svg
+share/icons/hicolor/scalable/apps/cinnamon.svg
+share/icons/hicolor/scalable/apps/removable-drives.svg
 share/icons/hicolor/scalable/categories/cs-applets.svg
+share/icons/hicolor/scalable/categories/cs-backgrounds-symbolic.svg
 share/icons/hicolor/scalable/categories/cs-backgrounds.svg
 share/icons/hicolor/scalable/categories/cs-bluetooth.svg
 share/icons/hicolor/scalable/categories/cs-cat-admin.svg
@@ -689,6 +702,7 @@ share/icons/hicolor/scalable/categories/cs-cat-prefs.svg
 share/icons/hicolor/scalable/categories/cs-color.svg
 share/icons/hicolor/scalable/categories/cs-date-time.svg
 share/icons/hicolor/scalable/categories/cs-default-applications.svg
+share/icons/hicolor/scalable/categories/cs-desklets-symbolic.svg
 share/icons/hicolor/scalable/categories/cs-desklets.svg
 share/icons/hicolor/scalable/categories/cs-desktop-effects.svg
 share/icons/hicolor/scalable/categories/cs-desktop.svg
@@ -699,20 +713,20 @@ share/icons/hicolor/scalable/categories/cs-extensions.svg
 share/icons/hicolor/scalable/categories/cs-firewall.svg
 share/icons/hicolor/scalable/categories/cs-fonts.svg
 share/icons/hicolor/scalable/categories/cs-general.svg
+share/icons/hicolor/scalable/categories/cs-input-method.svg
 share/icons/hicolor/scalable/categories/cs-keyboard.svg
 share/icons/hicolor/scalable/categories/cs-language.svg
-share/icons/hicolor/scalable/categories/cs-linuxmint.svg
 share/icons/hicolor/scalable/categories/cs-login.svg
 share/icons/hicolor/scalable/categories/cs-mouse.svg
 share/icons/hicolor/scalable/categories/cs-network.svg
 share/icons/hicolor/scalable/categories/cs-notifications.svg
+share/icons/hicolor/scalable/categories/cs-online-accounts.svg
 share/icons/hicolor/scalable/categories/cs-overview.svg
 share/icons/hicolor/scalable/categories/cs-panel.svg
 share/icons/hicolor/scalable/categories/cs-power.svg
 share/icons/hicolor/scalable/categories/cs-printer.svg
 share/icons/hicolor/scalable/categories/cs-privacy.svg
 share/icons/hicolor/scalable/categories/cs-region.svg
-share/icons/hicolor/scalable/categories/cs-retro.svg
 share/icons/hicolor/scalable/categories/cs-screen.svg
 share/icons/hicolor/scalable/categories/cs-screensaver.svg
 share/icons/hicolor/scalable/categories/cs-sound.svg
@@ -726,8 +740,23 @@ share/icons/hicolor/scalable/categories/cs-user-accounts.svg
 share/icons/hicolor/scalable/categories/cs-user.svg
 share/icons/hicolor/scalable/categories/cs-windows.svg
 share/icons/hicolor/scalable/categories/cs-workspaces.svg
+share/icons/hicolor/scalable/devices/audio-speaker-center-back.svg
+share/icons/hicolor/scalable/devices/audio-speaker-center.svg
+share/icons/hicolor/scalable/devices/audio-speaker-left-back.svg
+share/icons/hicolor/scalable/devices/audio-speaker-left-side.svg
+share/icons/hicolor/scalable/devices/audio-speaker-left.svg
+share/icons/hicolor/scalable/devices/audio-speaker-right-back.svg
+share/icons/hicolor/scalable/devices/audio-speaker-right-side.svg
+share/icons/hicolor/scalable/devices/audio-speaker-right.svg
+share/icons/hicolor/scalable/devices/audio-subwoofer.svg
+share/icons/hicolor/scalable/devices/bluetooth.svg
+share/icons/hicolor/scalable/devices/cpu-symbolic.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-danger.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-error.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-installed.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-running.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-system.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-update.svg
+share/polkit-1/actions/org.cinnamon.settings-users.policy
+share/xsessions/cinnamon.desktop
+share/xsessions/cinnamon2d.desktop
author	Rene Ladan <rene@FreeBSD.org>	2021-01-02 11:21:30 +0000
committer	Rene Ladan <rene@FreeBSD.org>	2021-01-02 11:21:30 +0000
commit	474895cdb67df33222fa2b2e67a4c6fc7dea0fa7 (patch)
tree	88f0bd8b077f4fe5cb17646d5336161aa4610b11 /x11
parent	9729352622704f6096153cf167ef06a4d7085051 (diff)
download	ports-474895cdb67df33222fa2b2e67a4c6fc7dea0fa7.tar.gz ports-474895cdb67df33222fa2b2e67a4c6fc7dea0fa7.zip