FreeBSD/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2026-06-02 11:08:52 +00:00
Code Issues Projects Releases Wiki Activity

x11/xfce4-screensaver: Update to 4.20.2

Browse Source 
Remove patch accepted upstream.
This commit is contained in:
Guido Falsi
2026-03-04 20:34:16 +01:00
parent a312596f23
commit c39d2d19db
4 changed files with 7 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/xfce4-screensaver/Makefile
+1 -2
View File
@@ -1,6 +1,5 @@
PORTNAME= xfce4-screensaver
PORTVERSION= 4.20.1
PORTREVISION= 3
PORTVERSION= 4.20.2
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
x11/xfce4-screensaver/distinfo
+3 -3
View File
@@ -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
x11/xfce4-screensaver/files/patch-src_gs-lock-plug.c
-48
View File
@@ -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 <stdlib.h>
#include <string.h>
#include <sys/utsname.h>
+#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
@@ -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;
x11/xfce4-screensaver/pkg-plist
+3
View File
@@ -50,6 +50,7 @@ share/icons/hicolor/scalable/apps/org.xfce.ScreenSaver.svg
%%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
@@ -68,7 +69,9 @@ share/icons/hicolor/scalable/apps/org.xfce.ScreenSaver.svg
%%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