Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Jul 2025 20:00:57 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: fda5a732370c - main - x11/cinnamon-screensaver: Update to 6.4.0
Message-ID:  <202507132000.56DK0v6B026780@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by arrowd:

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

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

    x11/cinnamon-screensaver: Update to 6.4.0
    
    PR:             288177
---
 x11/cinnamon-screensaver/Makefile  | 23 +++++++++++++++--------
 x11/cinnamon-screensaver/distinfo  |  6 +++---
 x11/cinnamon-screensaver/pkg-plist | 14 +++++++-------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 6b4de701e272..906339abc9d2 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	cinnamon-screensaver
-PORTVERSION=	5.4.2
-PORTREVISION=	3
+DISTVERSION=	6.4.0
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 
@@ -13,7 +12,6 @@ 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
 LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice \
 		libcinnamon-desktop.so:x11/cinnamon-desktop \
 		libdbus-glib-1.so:devel/dbus-glib \
@@ -24,14 +22,14 @@ RUN_DEPENDS=	${LOCALBASE}/lib/pam_gnome_keyring.so:security/gnome-keyring \
 		${PYTHON_PKGNAMEPREFIX}python-xapp>0:x11/py-python-xapp@${PY_FLAVOR} \
 		${LOCALBASE}/libexec/unix-selfauth-helper:security/unix-selfauth-helper
 
-USES=		gettext-tools gnome meson pkgconfig python shebangfix xorg
+USES=		gnome meson pkgconfig python shebangfix xorg localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 
-USE_XORG=	x11 xext xinerama xrandr xscrnsaver
+USE_XORG=	x11 xext xrandr
 
-USE_GNOME=	cairo gdkpixbuf glib20 intltool introspection:build libgnomekbd pygobject3
+USE_GNOME=	cairo gdkpixbuf glib20 gtk30 introspection:build pygobject3
 
 SHEBANG_GLOB=	*.py
 BINARY_ALIAS=	python3=${PYTHON_CMD}
@@ -40,9 +38,18 @@ USE_LDCONFIG=	yes
 
 SUB_FILES+=	cinnamon-screensaver.pam
 
+OPTIONS_DEFINE=		LOCKING SETRES XINERAMA
+OPTIONS_DEFAULT=	LOCKING XINERAMA
+
+LOCKING_DESC=	Compile in support for locking the display
+SETRES_DESC=	Use setresuid/setresgid in the setuid.c helper
+
+LOCKING_MESON_TRUE=	locking
+SETRES_MESON_TRUE=	setres
+XINERAMA_USE=		XORG=xinerama
+XINERAMA_MESON_TRUE=	xinerama
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib|g' \
-		${WRKSRC}/src/pamhelper/authClient.py
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/src/pamhelper/cinnamon-screensaver-pam-helper.c \
 		${WRKSRC}/libcscreensaver/test-passwd.c \
diff --git a/x11/cinnamon-screensaver/distinfo b/x11/cinnamon-screensaver/distinfo
index fa7052a69e99..3cc55efde9a6 100644
--- a/x11/cinnamon-screensaver/distinfo
+++ b/x11/cinnamon-screensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660022189
-SHA256 (gnome/linuxmint-cinnamon-screensaver-5.4.2_GH0.tar.gz) = 7ae54b1fc83fff3082b3b43bf5bf01f7cf49eb35cd6b5b42c0e454e2fd619748
-SIZE (gnome/linuxmint-cinnamon-screensaver-5.4.2_GH0.tar.gz) = 154799
+TIMESTAMP = 1735838597
+SHA256 (gnome/linuxmint-cinnamon-screensaver-6.4.0_GH0.tar.gz) = e985b68981482b7ead6aef55988937958539221d752f9a4feb7ced9ac32fe422
+SIZE (gnome/linuxmint-cinnamon-screensaver-6.4.0_GH0.tar.gz) = 160693
diff --git a/x11/cinnamon-screensaver/pkg-plist b/x11/cinnamon-screensaver/pkg-plist
index 7b8e7c7faa89..1afd45d1deac 100644
--- a/x11/cinnamon-screensaver/pkg-plist
+++ b/x11/cinnamon-screensaver/pkg-plist
@@ -2,13 +2,10 @@ bin/cinnamon-screensaver
 bin/cinnamon-screensaver-command
 bin/cinnamon-unlock-desktop
 etc/pam.d/cinnamon-screensaver
-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
-@(,,4555) libexec/cinnamon-screensaver-pam-helper
-libexec/cs-backup-locker
+libexec/cinnamon-screensaver/girepository-1.0/CScreensaver-1.0.typelib
+libexec/cinnamon-screensaver/libcscreensaver.so
+@(,,4555) libexec/cinnamon-screensaver/cinnamon-screensaver-pam-helper
+libexec/cinnamon-screensaver/cs-backup-locker
 %%DATADIR%%/__init__.py
 %%DATADIR%%/albumArt.py
 %%DATADIR%%/audioPanel.py
@@ -28,6 +25,7 @@ libexec/cs-backup-locker
 %%DATADIR%%/dbusdepot/loginInterface.py
 %%DATADIR%%/dbusdepot/logindClient.py
 %%DATADIR%%/dbusdepot/mediaPlayerWatcher.py
+%%DATADIR%%/dbusdepot/muffinClient.py
 %%DATADIR%%/dbusdepot/nameBlocker.py
 %%DATADIR%%/dbusdepot/sessionClient.py
 %%DATADIR%%/dbusdepot/uPowerClient.py
@@ -66,5 +64,7 @@ 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/apps/csr-backup-locker-icon.svg
+share/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg
+share/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg
 share/icons/hicolor/scalable/status/screensaver-blank.svg
 share/icons/hicolor/scalable/status/screensaver-notification-symbolic.svg


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507132000.56DK0v6B026780>