diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile index 2138ca1a5abd..8333ae25b60e 100644 --- a/x11/xfce4-screensaver/Makefile +++ b/x11/xfce4-screensaver/Makefile @@ -1,66 +1,65 @@ PORTNAME= xfce4-screensaver -PORTVERSION= 4.20.1 -PORTREVISION= 3 +PORTVERSION= 4.20.2 CATEGORIES= x11 xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce 4 screen saver and locker WWW= https://docs.xfce.org/apps/xfce4-screensaver/start LICENSE= GPLv2 LGPL20 LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libxklavier.so:x11/libxklavier USES= compiler:c11 gettext-tools gnome meson pkgconfig python \ shebangfix tar:xz xfce xorg USE_GNOME= glib20 gtk30 libwnck3 USE_XFCE= garcon xfconf USE_XORG= ice sm x11 xext xrandr xscrnsaver xxf86vm SHEBANG_FILES= src/xfce4-screensaver-configure.py MESON_ARGS= -Dsession-manager=consolekit \ -Dwayland=disabled \ -Dx11=enabled SCREENSAVER_DIR= share/applications/screensavers PORTDOCS= docbook.css xfce4-screensaver.html OPTIONS_DEFINE= DOCS NLS PAM OPTIONS_DEFAULT= PAM OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \ xmlto:textproc/xmlto DOCS_MESON_ENABLED= docs DOCS_MESON_ON= -Ddocdir=${DOCSDIR} NLS_USES= gettext-runtime PAM_RUN_DEPENDS= pam_helper:security/pam_helper PAM_MESON_ON= -Dauthentication-scheme=helper \ -Dpasswd-helper=${LOCALBASE}/bin/pam_helper PAM_MESON_OFF= -Dauthentication-scheme=pwent post-patch-NLS-off: @${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build post-patch-PAM-on: @${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \ ${WRKSRC}/src/gs-auth-pam.c post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR} @${REINPLACE_CMD} 's/^\(Name[^=]*=\)\(.*\)/\1XFCE \2/' ${STAGEDIR}${PREFIX}/etc/xdg/autostart/xfce4-screensaver.desktop post-install-PAM-on: ${INSTALL_DATA} ${FILESDIR}/xfce4-screensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xfce4-screensaver.sample .include diff --git a/x11/xfce4-screensaver/distinfo b/x11/xfce4-screensaver/distinfo index 17d8ce0d0290..c8db1594f75e 100644 --- a/x11/xfce4-screensaver/distinfo +++ b/x11/xfce4-screensaver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755272745 -SHA256 (xfce4/xfce4-screensaver-4.20.1.tar.xz) = a94ce9ca3f56db183f1cbc60ba4accd91575b02a6d20b1876ad19131982f2243 -SIZE (xfce4/xfce4-screensaver-4.20.1.tar.xz) = 256848 +TIMESTAMP = 1772489456 +SHA256 (xfce4/xfce4-screensaver-4.20.2.tar.xz) = 5032f60a31df5e50a80512e301b595be5ea6a6bd762cdd95cacc24cbd29a01d7 +SIZE (xfce4/xfce4-screensaver-4.20.2.tar.xz) = 265288 diff --git a/x11/xfce4-screensaver/files/patch-src_gs-lock-plug.c b/x11/xfce4-screensaver/files/patch-src_gs-lock-plug.c deleted file mode 100644 index 374c4f11525e..000000000000 --- a/x11/xfce4-screensaver/files/patch-src_gs-lock-plug.c +++ /dev/null @@ -1,48 +0,0 @@ ---- src/gs-lock-plug.c.orig 2025-08-15 14:02:14 UTC -+++ src/gs-lock-plug.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -56,6 +57,8 @@ - #include "xfce-bg.h" - #include "xfce-desktop-utils.h" - -+#define PGREP_MAX_PROCESS_LEN 15 -+ - #define MDM_FLEXISERVER_COMMAND "mdmflexiserver" - #define MDM_FLEXISERVER_ARGS "--startnew Standard" - -@@ -179,20 +182,16 @@ process_is_running (const char *name) { - - static gboolean - process_is_running (const char *name) { -- int num_processes; -- gchar *command = g_strdup_printf ("pidof %s | wc -l", name); -- FILE *fp = popen (command, "r"); -+ g_return_val_if_fail (strnlen (name, PGREP_MAX_PROCESS_LEN + 1) > PGREP_MAX_PROCESS_LEN, FALSE); -+#ifdef __FreeBSD__ -+ gchar *command = g_strdup_printf ("pgrep -ax %s", name); -+#else -+ gchar *command = g_strdup_printf ("pgrep -x %s", name); -+#endif -+ int rc = system (command); - g_free (command); - -- if (fp == NULL) -- return FALSE; -- -- if (fscanf (fp, "%d", &num_processes) != 1) -- num_processes = 0; -- -- pclose (fp); -- -- if (num_processes > 0) { -+ if (WIFEXITED (rc) && WEXITSTATUS (rc) == 0) { - return TRUE; - } else { - return FALSE; diff --git a/x11/xfce4-screensaver/pkg-plist b/x11/xfce4-screensaver/pkg-plist index d7afeb345d26..e7e6bf1f6d57 100644 --- a/x11/xfce4-screensaver/pkg-plist +++ b/x11/xfce4-screensaver/pkg-plist @@ -1,74 +1,77 @@ bin/xfce4-screensaver bin/xfce4-screensaver-command bin/xfce4-screensaver-preferences %%PAM%%@sample etc/pam.d/xfce4-screensaver.sample etc/xdg/autostart/xfce4-screensaver.desktop etc/xdg/menus/xfce4-screensavers.menu libexec/xfce4-screensaver-configure.py libexec/xfce4-screensaver-dialog libexec/xfce4-screensaver/floaters libexec/xfce4-screensaver/popsquares libexec/xfce4-screensaver/slideshow share/man/man1/xfce4-screensaver-command.1.gz share/man/man1/xfce4-screensaver-preferences.1.gz share/man/man1/xfce4-screensaver.1.gz share/applications/screensavers/xfce-personal-slideshow.desktop share/applications/screensavers/xfce-popsquares.desktop share/applications/screensavers/xfce-floaters.desktop share/applications/xfce4-screensaver-preferences.desktop share/dbus-1/services/org.xfce.ScreenSaver.service share/desktop-directories/xfce4-screensaver.directory share/icons/hicolor/128x128/apps/org.xfce.ScreenSaver.png share/icons/hicolor/16x16/apps/org.xfce.ScreenSaver.png share/icons/hicolor/24x24/apps/org.xfce.ScreenSaver.png share/icons/hicolor/32x32/apps/org.xfce.ScreenSaver.png share/icons/hicolor/48x48/apps/org.xfce.ScreenSaver.png share/icons/hicolor/scalable/apps/org.xfce.ScreenSaver.svg %%NLS%%share/locale/be/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/et/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/he/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/hye/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/kab/LC_MESSAGES/xfce4-screensaver.mo +%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/ms/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/oc/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/ro/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/sl/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/th/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-screensaver.mo +%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-screensaver.mo +%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-screensaver.mo share/pixmaps/xfce-logo-white.svg