Date: Sun, 17 Mar 2024 23:48:45 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fdb5363efcb5 - main - x11/xfce4-screensaver: UPdate patch to match upstreamed one Message-ID: <202403172348.42HNmjAs059666@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdb5363efcb59716c000abd59f66692ec4244d8d commit fdb5363efcb59716c000abd59f66692ec4244d8d Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2024-03-17 23:46:34 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2024-03-17 23:46:34 +0000 x11/xfce4-screensaver: UPdate patch to match upstreamed one PR: 277763 Obtained from: https://gitlab.xfce.org/apps/xfce4-screensaver/-/commit/cd212e0e964af794eb98c6a0c1108204cee9ef32 --- x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c b/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c index 65dcf88e7068..59b7fd556fd1 100644 --- a/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c +++ b/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c @@ -1,19 +1,13 @@ --- src/gs-auth-pwent.c.orig 2023-03-20 15:38:27 UTC +++ src/gs-auth-pwent.c -@@ -37,10 +37,12 @@ - # include <unistd.h> +@@ -38,7 +38,9 @@ #endif --#ifdef HAVE_LIBCRYPT + #ifdef HAVE_LIBCRYPT -# include <crypt.h> --#else --# define crypt(a, b) NULL -+#if !defined(__FreeBSD__) -+# ifdef HAVE_LIBCRYPT ++# ifndef __FreeBSD__ +# include <crypt.h> -+# else -+# define crypt(a, b) NULL +# endif + #else + # define crypt(a, b) NULL #endif - - #ifdef __bsdi__
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403172348.42HNmjAs059666>