git: 3b1e4291181e - main - x11/cinnamon-desktop: Update to 6.4.1

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3b1e4291181e3205630ce1e1decfa4da84f893b5

commit 3b1e4291181e3205630ce1e1decfa4da84f893b5
Author:     Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2025-07-13 08:11:34 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-07-13 20:00:40 +0000

    x11/cinnamon-desktop: Update to 6.4.1
    
    PR:             288177
---
 x11/cinnamon-desktop/Makefile                      | 16 ++++++-----
 x11/cinnamon-desktop/distinfo                      |  6 ++---
 .../files/patch-libcvc_gvc-channel-map.c           | 31 ----------------------
 x11/cinnamon-desktop/pkg-plist                     |  3 ++-
 4 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index 839a763292a0..7b45a0f70a5d 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	cinnamon-desktop
-PORTVERSION=	5.4.2
-PORTREVISION=	5
+DISTVERSION=	6.4.1
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 
@@ -14,13 +13,16 @@ 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
+		libxkbfile>=0:x11/libxkbfile \
+		iso-codes>=0:misc/iso-codes
+LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
+		libudev.so:devel/libudev-devd
 RUN_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config \
-		libxkbfile>=0:x11/libxkbfile
+		libxkbfile>=0:x11/libxkbfile \
+		iso-codes>=0:misc/iso-codes
 
 USES=		gettext gnome localbase meson pkgconfig python:build shebangfix xorg
-USE_GNOME=	cairo gdkpixbuf gtk30 intltool introspection
+USE_GNOME=	cairo gdkpixbuf glib20 gtk30 introspection
 USE_XORG=	x11 xext xrandr
 USE_LDCONFIG=	yes
 
@@ -53,6 +55,8 @@ GLIB_SCHEMAS=	org.cinnamon.desktop.a11y.applications.gschema.xml \
 		org.cinnamon.desktop.thumbnailers.gschema.xml \
 		org.cinnamon.desktop.wm.preferences.gschema.xml
 
+MESON_ARGS=	-Dsystemd=disabled
+
 OPTIONS_DEFINE=	ALSA
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
diff --git a/x11/cinnamon-desktop/distinfo b/x11/cinnamon-desktop/distinfo
index 607d949b3e3b..e83fe84552c6 100644
--- a/x11/cinnamon-desktop/distinfo
+++ b/x11/cinnamon-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660019817
-SHA256 (gnome/linuxmint-cinnamon-desktop-5.4.2_GH0.tar.gz) = 862828d97518becf9dd085d76cae9d65090811c82f1dab41392fe89a6b927371
-SIZE (gnome/linuxmint-cinnamon-desktop-5.4.2_GH0.tar.gz) = 502072
+TIMESTAMP = 1735677829
+SHA256 (gnome/linuxmint-cinnamon-desktop-6.4.1_GH0.tar.gz) = 0e9af48b97910302a1130424a05c63b2e7aacb4ce6ae7a1d53c71bcd157a3a8f
+SIZE (gnome/linuxmint-cinnamon-desktop-6.4.1_GH0.tar.gz) = 509746
diff --git a/x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c b/x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c
deleted file mode 100644
index 4bdf7e1ea04f..000000000000
--- a/x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git libcvc/gvc-channel-map.c libcvc/gvc-channel-map.c
-index 7f14c8b..69682ac 100644
---- libcvc/gvc-channel-map.c
-+++ libcvc/gvc-channel-map.c
-@@ -109,7 +109,7 @@ gvc_channel_map_set_balance (GvcChannelMap *map,
- {
-         pa_cvolume cv;
- 
--        g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
-+        g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
- 
-         if (!gvc_channel_map_can_balance (map))
-                 return;
-@@ -149,7 +149,7 @@ gvc_channel_map_set_fade (GvcChannelMap *map,
- {
-         pa_cvolume cv;
- 
--        g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
-+        g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
- 
-         if (!gvc_channel_map_can_fade (map))
-                 return;
-@@ -191,7 +191,7 @@ gvc_channel_map_set_lfe (GvcChannelMap *map,
- {
-         pa_cvolume cv;
- 
--        g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
-+        g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
- 
-         if (!gvc_channel_map_has_lfe (map))
-                 return;
diff --git a/x11/cinnamon-desktop/pkg-plist b/x11/cinnamon-desktop/pkg-plist
index 0dee9904a389..90b7bfcd1604 100644
--- a/x11/cinnamon-desktop/pkg-plist
+++ b/x11/cinnamon-desktop/pkg-plist
@@ -3,11 +3,12 @@ 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-idle-monitor.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-systemd.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