From nobody Sun Jul 13 20:00:58 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bgGXr13vSz61Q0b; Sun, 13 Jul 2025 20:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgGXp4GQZz3D5Z; Sun, 13 Jul 2025 20:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752436858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0YOePx13pBTHTpOwamT4xb6dSklNU4WJXdaQw9L6wXg=; b=psy0vebpoLeCEBPoZOD65bIorqNIl4vbTImCzjV6MpcD0ei3wRAl9j00M/8jbzsq+UW3lb jeL2my4cppDKEtZ6bTbVMxR1KHf6dGVxV5EazzKauPMkPc5gK3bpC6u3yisbscYTBefjZD i3sIntKsCQqDIhDzTWECFl9D2CJseqTu8EwzhoWz6BqzzDHFMdkpzob3slila3KINO1Agg X4+86hNMXKhIuzQ9y/JGQEw+S+dY9BtjcdnPpBd8KCQf/GaOVB73qxyR826hgP/1Lit73s kqnUUgsgMAEhYsn4sfuDJb3K2fH0i8tOXzSVKpxb+Dc4G/IDwprTflAF35wuNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752436858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0YOePx13pBTHTpOwamT4xb6dSklNU4WJXdaQw9L6wXg=; b=KJVrkUwwnoOHlpzO4MQAMTBKbyIjPK+AwV4sSQQlgtLFD8Xnqx3QG75ZWdBQMhgQBPu0Uy yqk9MEJKT3GicI/4/ZQXXlFyIO7ASHb7q/XaGMEexjzZ5g6r8a3wMVytjkSR5lAehs5bpi E2O7tDwBZC+gJwLneFlOlaxn5HWtIcJanVfw4FK85bXnoX/UyiVZGxXTiA2diJEl0k9r3u cn2cC1bv789cCrYu9N3gNLIMqDFmtFelu0wFSdDVHzf2Xv00g6bHnKjiQNpVI4rUsG9tP7 zElyfZxfrNc8rGfQB2/sCu2Y5lOFeeY1/yR48XQtg4m+Mov5mEUHXjqT6hAAAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752436858; a=rsa-sha256; cv=none; b=cHt9aVmzJ+Yd5KdZ98RQbQVYU34NxzmwcAPQnmRmU2eDuw+0rdWG6Gf9Zm9KU5tEUF0iUG UV52dcoCX2XJXKSeizK/sXHJ5Dv/Al3ab8gJ/QLXFpQRqs0HLgT1CtLMnUBwXA0K9DWyrS SHHyBiOVc8WHdAQbmQFyilH/FPvMKMauIbCE5IruSMHQ34uS4osw/fpFYmhwYWMRqLEWbo OqymPAZrHiaJ1LYqR1HzB8wI25mbW1DOoPB6oBByv5mH3kcJ3nhOwgjp5AgpXxA7yMMKkQ nmmaAtI+nzYkEUEcR3mWc+7tl/v63jMuQdrccAJ9h18bOv51UKjCEq3Kb1R8eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgGXp3hqlz74M; Sun, 13 Jul 2025 20:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56DK0wUr026818; Sun, 13 Jul 2025 20:00:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DK0wsV026815; Sun, 13 Jul 2025 20:00:58 GMT (envelope-from git) Date: Sun, 13 Jul 2025 20:00:58 GMT Message-Id: <202507132000.56DK0wsV026815@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 3b1e4291181e - main - x11/cinnamon-desktop: Update to 6.4.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b1e4291181e3205630ce1e1decfa4da84f893b5 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b1e4291181e3205630ce1e1decfa4da84f893b5 commit 3b1e4291181e3205630ce1e1decfa4da84f893b5 Author: Pavel Timofeev AuthorDate: 2025-07-13 08:11:34 +0000 Commit: Gleb Popov 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