git: 959cd3e9bf4d - main - x11/cinnamon: Update to 6.4.10
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 13 Jul 2025 20:01:01 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=959cd3e9bf4db54f2676042b068aabc84e8ce318
commit 959cd3e9bf4db54f2676042b068aabc84e8ce318
Author: Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2025-07-13 08:16:46 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-07-13 20:00:41 +0000
x11/cinnamon: Update to 6.4.10
PR: 288177
---
x11/cinnamon/Makefile | 69 +++++++++--
x11/cinnamon/distinfo | 6 +-
.../patch-docs_reference_cinnamon_meson.build | 13 +++
...namon-settings-users_cinnamon-settings-users.py | 59 ++++++++++
...sr_share_cinnamon_cinnamon-settings_bin_capi.py | 48 ++------
..._cinnamon_cinnamon-settings_modules_cs__info.py | 41 +++++++
x11/cinnamon/pkg-plist | 130 ++++++++++++++++-----
7 files changed, 282 insertions(+), 84 deletions(-)
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 6261c84f1904..b97ed97c9826 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -1,6 +1,5 @@
PORTNAME= cinnamon
-PORTVERSION= 5.4.9
-PORTREVISION= 8
+DISTVERSION= 6.4.10
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome
@@ -13,15 +12,17 @@ WWW= https://github.com/linuxmint/cinnamon
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${LOCALBASE}/include/EGL/eglmesaext.h:graphics/mesa-dri
+BUILD_DEPENDS= ${LOCALBASE}/include/EGL/eglmesaext.h:graphics/mesa-dri \
+ ${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR}
LIB_DEPENDS= libcjs.so:lang/cjs \
libmuffin.so:x11-wm/muffin \
libcinnamon-menu-3.so:x11/cinnamon-menus \
libdbus-1.so:devel/dbus \
libpolkit-agent-1.so:sysutils/polkit \
libatk-bridge-2.0.so:accessibility/at-spi2-core \
- libsoup-2.4.so:devel/libsoup \
- libxapp.so:x11/xapp
+ libxapp.so:x11/xapp \
+ libgcr-base-3.so:security/gcr3 \
+ libcinnamon-desktop.so:x11/cinnamon-desktop
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
gnome-themes-extra>3.0.0:x11-themes/gnome-themes-extra \
caribou>0:accessibility/caribou \
@@ -45,9 +46,18 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
${LOCALBASE}/lib/girepository-1.0/GSound-1.0.typelib:audio/gsound \
gnome-backgrounds>0:x11-themes/gnome-backgrounds \
metacity:x11-wm/metacity \
- tint2:x11/tint
-
-USES= compiler:c11 cpe gettext-runtime gettext-tools:run gl gnome gstreamer \
+ tint2:x11/tint \
+ lspci:sysutils/pciutils \
+ ${LOCALBASE}/libexec/polkit-gnome-authentication-agent-1:sysutils/polkit-gnome \
+ ${LOCALBASE}/libexec/cups-pk-helper-mechanism:print/cups-pk-helper \
+ ${PYTHON_PKGNAMEPREFIX}tinycss2>0:textproc/py-tinycss2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
+ xdg-open:devel/xdg-utils \
+ xdg-user-dirs-gtk>0:x11/xdg-user-dirs-gtk \
+ inxi:sysutils/inxi \
+ wget:ftp/wget
+
+USES= compiler:c11 cpe gettext-runtime gettext-tools:run gl gnome \
meson perl5 pkgconfig python shebangfix xorg
CPE_VENDOR= linuxmint
USE_GNOME= cairo gdkpixbuf glib20 gtk30 intltool introspection libxml2 pygobject3
@@ -59,21 +69,28 @@ USE_GITHUB= yes
GH_ACCOUNT= linuxmint
SHEBANG_GLOB= *.py
-SHEBANG_FILES= files/* src/data-to-c.pl
+SHEBANG_FILES= files/* src/data-to-c.pl data/theme/parse-sass.sh
USE_LDCONFIG= yes
+# These libs are found via rpath mechanism
+NO_SHLIB_REQUIRES_GLOB= libmuffin-clutter-* libmuffin-cogl-*
BINARY_ALIAS= python3=${PYTHON_CMD}
MESON_ARGS= -Ddisable_networkmanager=true
GLIB_SCHEMAS= org.cinnamon.gschema.xml
-OPTIONS_DEFINE= DOCS NLS
-OPTIONS_EXCLUDE= DOCS
+OPTIONS_DEFINE= DOCS NLS WAYLAND RECORDER
+OPTIONS_DEFAULT= RECORDER
OPTIONS_SUB= yes
+RECORDER_DESC= Build the cinnamon recorder into source
+
DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc
DOCS_MESON_TRUE= docs
+WAYLAND_MESON_TRUE= wayland
+RECORDER_MESON_TRUE= build_recorder
+RECORDER_USES= gstreamer
NLS_RUN_DEPENDS= cinnamon-translations>0:misc/cinnamon-translations
@@ -94,15 +111,43 @@ post-patch:
${XARGS} ${REINPLACE_CMD} -e "s|/usr/lib|${PREFIX}/lib|g"
@${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/bin" | \
- ${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin|${PREFIX}/bin|g"
+ ${XARGS} ${REINPLACE_CMD} -e '\x/usr/bin/passwdx!s|/usr/bin|${PREFIX}/bin|g'
+
+ @${REINPLACE_CMD} -e "/prefixes = /s|'/usr'|'${PREFIX}'|" \
+ ${WRKSRC}/files/usr/bin/xlet-about-dialog
+ # Stop loading network-manager applet by default
+ @${REINPLACE_CMD} -e "s|, 'panel1:right:7:network@cinnamon.org'||" \
+ ${WRKSRC}/data/org.cinnamon.gschema.xml
+
+ # Fix build with no network-manager
@${REINPLACE_CMD} -e '/cs-bluetooth/d; /cs-network/d' \
${WRKSRC}/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+ @${REINPLACE_CMD} -e 's/nm-applet;//' \
+ ${WRKSRC}/meson.build
+
+ @${REINPLACE_CMD} -e '/imports.ui.networkAgent/d' \
+ ${WRKSRC}/js/ui/main.js
+ # End of Fix build with no network-manager
+
+ # Fix symlink installation
+ @${REINPLACE_CMD} -e "s|DESTDIR|MESON_INSTALL_DESTDIR_PREFIX|" \
+ ${WRKSRC}/install-scripts/add_symlink.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"
+ # Fix applets that try to exec just python3
+ @${REINPLACE_CMD} -e "/'python3[' ]/s|python3|${PYTHON_CMD}|" \
+ ${WRKSRC}/files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js \
+ ${WRKSRC}/files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/menus.js
+
+ # Fix system lp(1) overlapping with cups' lp(1)
+ @${REINPLACE_CMD} -e "/'lp'/s|lp|${PREFIX}/bin/lp|" \
+ ${WRKSRC}/files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js
+
# gtk-doc builds erroneous documentation files otherwise
@${FIND} ${WRKSRC} -name '*.orig' -type f -delete
@${FIND} ${WRKSRC} -name '*.bak' -type f -delete
diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo
index 88eb442ad3e0..267ad77e131a 100644
--- a/x11/cinnamon/distinfo
+++ b/x11/cinnamon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660060329
-SHA256 (gnome/linuxmint-cinnamon-5.4.9_GH0.tar.gz) = 19c5e85f65baacc79f961cbcebb20fb0050ad6f21678638a9dd1868d197b4727
-SIZE (gnome/linuxmint-cinnamon-5.4.9_GH0.tar.gz) = 2468335
+TIMESTAMP = 1752081962
+SHA256 (gnome/linuxmint-cinnamon-6.4.10_GH0.tar.gz) = eff6d55ec2b6443cec5b829df6240b329fbfa77aafd2064a60fdde2fc5b59f34
+SIZE (gnome/linuxmint-cinnamon-6.4.10_GH0.tar.gz) = 2592994
diff --git a/x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build b/x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build
new file mode 100644
index 000000000000..10cdab7f29d7
--- /dev/null
+++ b/x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build
@@ -0,0 +1,13 @@
+--- docs/reference/cinnamon/meson.build.orig 2025-02-09 15:54:24 UTC
++++ docs/reference/cinnamon/meson.build
+@@ -11,6 +11,10 @@ endif
+ ignore += 'cinnamon-recorder.h'
+ endif
+
++if not have_networkmanager
++ ignore += 'cinnamon-network-agent.h'
++endif
++
+ gnome.gtkdoc(
+ 'cinnamon',
+ mode: 'xml',
diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py
new file mode 100644
index 000000000000..0ee26614724f
--- /dev/null
+++ b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py
@@ -0,0 +1,59 @@
+--- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2025-07-10 21:12:25 UTC
++++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -255,7 +255,7 @@ class PasswordDialog(Gtk.Dialog):
+ self.user.set_password(newpass, "")
+ mask = self.group_mask.get_text()
+ if "nopasswdlogin" in mask:
+- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
++ subprocess.call(["pw", "groupmod", "nopasswdlogin", "-d", self.user.get_user_name()])
+ mask = mask.split(", ")
+ mask.remove("nopasswdlogin")
+ mask = ", ".join(mask)
+@@ -620,7 +620,7 @@ class Module:
+ response = dialog.run()
+ if response == Gtk.ResponseType.OK:
+ groups = dialog.get_selected_groups()
+- subprocess.call(["usermod", user.get_user_name(), "-G", ",".join(groups)])
++ subprocess.call(["pw", "usermod", user.get_user_name(), "-G", ",".join(groups)])
+ groups.sort()
+ self.groups_label.set_text(", ".join(groups))
+ dialog.destroy()
+@@ -900,9 +900,9 @@ class Module:
+ piter = self.users.append(None, [new_user, pixbuf, description])
+ # Add the user to his/her own group and sudo if Administrator was selected
+ if dialog.account_type_combo.get_active() == 1:
+- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
++ subprocess.call(["pw", "usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
+ else:
+- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
++ subprocess.call(["pw", "usermod", username, "-G", "%s,nopasswdlogin" % username])
+ self.load_groups()
+ dialog.destroy()
+
+@@ -947,7 +947,7 @@ class Module:
+ d.set_default_response(Gtk.ResponseType.NO)
+ r = d.run()
+ if r == Gtk.ResponseType.YES:
+- subprocess.call(["groupdel", group])
++ subprocess.call(["pw", "groupdel", group])
+ self.load_groups()
+ d.destroy()
+
+@@ -955,7 +955,7 @@ class Module:
+ dialog = GroupDialog(_("Group Name"), "", self.window)
+ response = dialog.run()
+ if response == Gtk.ResponseType.OK:
+- subprocess.call(["groupadd", dialog.entry.get_text().lower()])
++ subprocess.call(["pw", "groupadd", dialog.entry.get_text().lower()])
+ self.load_groups()
+ dialog.destroy()
+
+@@ -966,7 +966,7 @@ class Module:
+ dialog = GroupDialog(_("Group Name"), group, self.window)
+ response = dialog.run()
+ if response == Gtk.ResponseType.OK:
+- subprocess.call(["groupmod", group, "-n", dialog.entry.get_text().lower()])
++ subprocess.call(["pw", "groupmod", group, "-l", dialog.entry.get_text().lower()])
+ self.load_groups()
+ dialog.destroy()
+
diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py
index 8ea487050de1..92fb927f975a 100644
--- a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py
+++ b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py
@@ -1,39 +1,13 @@
---- files/usr/share/cinnamon/cinnamon-settings/bin/capi.py.orig 2022-06-21 15:01:39 UTC
+--- files/usr/share/cinnamon/cinnamon-settings/bin/capi.py.orig 2025-07-10 16:06:25 UTC
+++ files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
-@@ -27,31 +27,11 @@ class CManager():
- self.extension_point = Gio.io_extension_point_register ("cinnamon-control-center-1")
- self.modules = []
+@@ -30,7 +30,9 @@ class CManager:
+ # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or 'arm-linux-gnueabihf'
+ # see also: https://wiki.debian.org/Python/MultiArch
+ triplet = sysconfig.get_config_var('MULTIARCH')
+- paths = ["/usr/lib", "/usr/lib64", f"/usr/lib/{triplet}"]
++ paths = ["/usr/lib", "/usr/lib64"]
++ if triplet:
++ paths.append(f"/usr/lib/{triplet}")
-- architecture = platform.machine()
-- # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or 'arm-linux-gnueabihf'
-- # see also: https://wiki.debian.org/Python/MultiArch
-- triplet = sysconfig.get_config_var('MULTIARCH')
-- paths = ["/usr/lib", f"/usr/lib/{triplet}"]
--
-- # On x86 archs, iterate through multiple paths
-- # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu
-- x86archs = ["i386", "i486", "i586", "i686"]
-- if architecture in x86archs:
-- for arch in x86archs:
-- paths += ["/usr/lib/%s" % arch]
-- elif architecture == "x86_64":
-- paths += ["/usr/lib/x86_64", "/usr/lib64"]
-- else:
-- paths += ["/usr/lib/%s" % architecture]
--
-- for path in paths:
-- if not os.path.islink(path):
-- path = os.path.join(path, "cinnamon-control-center-1/panels")
-- if os.path.exists(path):
-- try:
-- self.modules = self.modules + Gio.io_modules_load_all_in_directory(path)
-- except Exception as e:
-- print("capi failed to load multiarch modules from %s: " % path, e)
-+ path = os.path.join("/usr/lib", "cinnamon-control-center-1/panels")
-+ try:
-+ self.modules = self.modules + Gio.io_modules_load_all_in_directory(path)
-+ except Exception as e:
-+ print("capi failed to load multiarch modules from %s: " % path, e)
-
- def get_c_widget(self, mod_id):
- extension = self.extension_point.get_extension_by_name(mod_id)
+ # On x86 archs, iterate through multiple paths
+ # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu
diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py
new file mode 100644
index 000000000000..3cc8afe08f48
--- /dev/null
+++ b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py
@@ -0,0 +1,41 @@
+--- files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py.orig 2025-07-10 21:17:21 UTC
++++ files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
+@@ -54,8 +54,11 @@ def getDiskSize():
+ def getDiskSize():
+ disksize = 0
+ try:
+- out = getProcessOut(("lsblk", "--json", "--output", "size", "--bytes", "--nodeps"))
+- jsonobj = loads(''.join(out))
++ out = getProcessOut(("geom", "disk", "list"))
++ jsonobj = {'blockdevices': []}
++ for disk in out:
++ if "Mediasize:" in disk:
++ jsonobj['blockdevices'].append({'size': disk.split()[1]})
+ except Exception:
+ return _("Unknown size"), False
+
+@@ -71,13 +74,12 @@ def getProcInfos():
+ # Source: https://github.com/dylanaraps/neofetch/blob/6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f/neofetch#L2163
+ cpudetect = ("model name", "Hardware", "Processor", "cpu model", "chip type", "cpu type")
+ infos = [
+- ("/proc/cpuinfo", [("cpu_name", cpudetect), ("cpu_siblings", ("siblings",)), ("cpu_cores", ("cpu cores",))]),
+- ("/proc/meminfo", [("mem_total", ("MemTotal",))])
++ ("hw", [("cpu_name", ("hw.model",)), ("cpu_cores", ("hw.ncpu",)), ("mem_total", ("hw.physmem",))]),
+ ]
+
+ result = {}
+ for (proc, pairs) in infos:
+- for line in getProcessOut(("cat", proc)):
++ for line in getProcessOut(("sysctl", proc)):
+ for (key, start) in pairs:
+ for item in start:
+ if line.startswith(item):
+@@ -122,7 +124,7 @@ def createSystemInfos():
+ if memunit == "kB":
+ infos.append((_("Memory"), '%.1f %s' % ((float(memsize)/(1024*1024)), _("GiB"))))
+ else:
+- infos.append((_("Memory"), procInfos['mem_total']))
++ infos.append((_("Memory"), '%.1f %s' % ((float(memsize)/(1024*1024*1024)), _("GiB"))))
+
+ diskSize, multipleDisks = getDiskSize()
+ if multipleDisks:
diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist
index 877786656bc5..f27549e838d2 100644
--- a/x11/cinnamon/pkg-plist
+++ b/x11/cinnamon/pkg-plist
@@ -1,9 +1,7 @@
bin/cinnamon
bin/cinnamon-calendar-server
-bin/cinnamon-close-dialog
bin/cinnamon-dbus-command
bin/cinnamon-desktop-editor
-bin/cinnamon-display-changes-dialog
bin/cinnamon-file-dialog
bin/cinnamon-hover-click
bin/cinnamon-install-spice
@@ -26,6 +24,7 @@ bin/cinnamon2d
bin/xlet-about-dialog
bin/xlet-settings
etc/xdg/menus/cinnamon-applications.menu
+etc/xdg/menus/cinnamon-applications-merged
lib/cinnamon/Cinnamon-0.1.typelib
lib/cinnamon/St-1.0.typelib
lib/cinnamon/libcinnamon.so
@@ -45,8 +44,6 @@ share/man/man1/cinnamon-screensaver-lock-dialog.1.gz
share/man/man1/cinnamon-settings.1.gz
share/man/man1/cinnamon.1.gz
share/man/man1/cinnamon2d.1.gz
-share/man/man1/gnome-session-cinnamon.1.gz
-share/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
@@ -65,7 +62,6 @@ 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
@@ -82,6 +78,87 @@ share/applications/cinnamon-settings-workspaces.desktop
share/applications/cinnamon-settings.desktop
share/applications/cinnamon.desktop
share/applications/cinnamon2d.desktop
+share/applications/cinnamon-settings-actions.desktop
+share/applications/cinnamon-settings-gestures.desktop
+share/applications/cinnamon-settings-nightlight.desktop
+%%WAYLAND%%share/applications/cinnamon-wayland.desktop
+%%WAYLAND%%%%DATADIR%%-session/sessions/cinnamon-wayland.session
+%%DATADIR%%/Cinnamon-0.1.gir
+%%DATADIR%%/St-1.0.gir
+%%DATADIR%%/applets/cornerbar@cinnamon.org/applet.js
+%%DATADIR%%/applets/cornerbar@cinnamon.org/metadata.json
+%%DATADIR%%/applets/cornerbar@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/state.js
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/workspace.js
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-active-notifications-disabled-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-notification-active-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-notification-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-notifications-disabled-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/settings-schema.json
+%%DATADIR%%/cinnamon-settings/appearance-dark.svg
+%%DATADIR%%/cinnamon-settings/appearance-light.svg
+%%DATADIR%%/cinnamon-settings/appearance-mixed.svg
+%%DATADIR%%/cinnamon-settings/color_dot.svg
+%%DATADIR%%/cinnamon-settings/modules/cs_actions.py
+%%DATADIR%%/cinnamon-settings/modules/cs_gestures.py
+%%DATADIR%%/cinnamon-settings/modules/cs_nightlight.py
+%%DATADIR%%/cinnamon-settings/themes.ui
+%%DATADIR%%/js/misc/portalHandlers.js
+%%DATADIR%%/js/ui/audioDeviceSelection.js
+%%DATADIR%%/js/ui/barLevel.js
+%%DATADIR%%/js/ui/closeDialog.js
+%%DATADIR%%/js/ui/dialog.js
+%%DATADIR%%/js/ui/endSessionDialog.js
+%%DATADIR%%/js/ui/gestures/ToucheggTypes.js
+%%DATADIR%%/js/ui/gestures/actions.js
+%%DATADIR%%/js/ui/gestures/gesturesManager.js
+%%DATADIR%%/js/ui/gestures/mprisController.js
+%%DATADIR%%/js/ui/keyringPrompt.js
+%%DATADIR%%/js/ui/locatePointer.js
+%%DATADIR%%/js/ui/monitorLabeler.js
+%%DATADIR%%/js/ui/networkAgent.js
+%%DATADIR%%/js/ui/polkitAuthenticationAgent.js
+%%DATADIR%%/js/ui/ripples.js
+%%DATADIR%%/js/ui/userWidget.js
+%%DATADIR%%/js/ui/workspaceOsd.js
+%%DATADIR%%/theme/add-workspace-hover.svg
+%%DATADIR%%/theme/add-workspace.svg
+%%DATADIR%%/theme/calendar-arrow-left-hover.svg
+%%DATADIR%%/theme/calendar-arrow-right-hover.svg
+%%DATADIR%%/theme/radio-off.svg
+%%DATADIR%%/theme/radio.svg
+%%DATADIR%%/theme/toggle-off.svg
+%%DATADIR%%/theme/toggle-on.svg
+%%DATADIR%%/theme/trash-icon.svg
+%%DATADIR%%/thumbnails/cursors/Bibata-Modern-Amber.png
+%%DATADIR%%/thumbnails/cursors/Bibata-Modern-Classic.png
+%%DATADIR%%/thumbnails/cursors/Bibata-Modern-Ice.png
+%%DATADIR%%/thumbnails/cursors/Bibata-Original-Classic.png
+%%DATADIR%%/thumbnails/cursors/Bibata-Original-Ice.png
+%%DATADIR%%/thumbnails/cursors/Breeze_Snow.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Black.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Blue.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Green.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Orange.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Red.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Black.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Blue.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Green.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Orange.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Red.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-White.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-White.png
+%%DATADIR%%/thumbnails/cursors/Paper.png
+%%DATADIR%%/thumbnails/cursors/Yaru.png
+%%DATADIR%%/thumbnails/cursors/breeze_cursors.png
+%%DATADIR%%/thumbnails/cursors/handhelds.png
+%%DATADIR%%/thumbnails/cursors/oxy-black.png
+%%DATADIR%%/thumbnails/cursors/oxy-blue.png
+%%DATADIR%%/thumbnails/cursors/oxy-white.png
+%%DATADIR%%/thumbnails/cursors/oxy-yellow.png
+%%DATADIR%%/thumbnails/cursors/oxy-zion.png
+%%DATADIR%%/thumbnails/cursors/redglass.png
+%%DATADIR%%/thumbnails/cursors/whiteglass.png
%%DATADIR%%-session/sessions/cinnamon.session
%%DATADIR%%-session/sessions/cinnamon2d.session
%%DATADIR%%/applets/a11y@cinnamon.org/applet.js
@@ -99,7 +176,6 @@ share/applications/cinnamon2d.desktop
%%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
@@ -254,10 +330,8 @@ share/applications/cinnamon2d.desktop
%%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/bin/util.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
@@ -279,7 +353,6 @@ share/applications/cinnamon2d.desktop
%%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
@@ -352,7 +425,6 @@ share/applications/cinnamon2d.desktop
%%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
@@ -429,35 +501,16 @@ share/applications/cinnamon2d.desktop
%%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-selected.svg
-%%DATADIR%%/theme/calendar-today-selected.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
@@ -512,8 +565,6 @@ share/desktop-directories/cinnamon-utility.directory
%%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
@@ -523,6 +574,7 @@ share/desktop-directories/cinnamon-utility.directory
%%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-PopupResizeHandler.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
@@ -677,7 +729,6 @@ share/desktop-directories/cinnamon-utility.directory
%%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-tray-manager.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-util.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-wm.html
@@ -779,6 +830,21 @@ 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/desktop-directories/cinnamon-science.directory
+share/glib-2.0/schemas/org.cinnamon.gestures.gschema.xml
+share/icons/hicolor/scalable/actions/view-conceal-symbolic.svg
+share/icons/hicolor/scalable/actions/view-reveal-symbolic.svg
+%%WAYLAND%%share/icons/hicolor/scalable/apps/cinnamon-wayland_badge-symbolic.svg
+share/icons/hicolor/scalable/apps/cinnamon2d_badge-symbolic.svg
+share/icons/hicolor/scalable/apps/cinnamon_badge-symbolic.svg
+share/icons/hicolor/scalable/categories/cinnamon-all-applications-symbolic.svg
+share/icons/hicolor/scalable/categories/cs-actions.svg
+share/icons/hicolor/scalable/categories/cs-gestures.svg
+share/icons/hicolor/scalable/categories/cs-nightlight.svg
+share/man/man1/cinnamon-session-cinnamon.1.gz
+share/man/man1/cinnamon-session-cinnamon2d.1.gz
+%%WAYLAND%%share/wayland-sessions/cinnamon-wayland.desktop
+share/xdg-desktop-portal/x-cinnamon-portals.conf
share/polkit-1/actions/org.cinnamon.settings-users.policy
share/xsessions/cinnamon.desktop
share/xsessions/cinnamon2d.desktop