Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Mar 2024 23:05:23 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: be487aebb944 - main - x11/xfce4-screensaver: Fix build when PAM option is off
Message-ID:  <202403172305.42HN5N4J092541@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=be487aebb9446495178c06f525a2e77987ae4352

commit be487aebb9446495178c06f525a2e77987ae4352
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2024-03-17 23:02:05 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2024-03-17 23:05:18 +0000

    x11/xfce4-screensaver: Fix build when PAM option is off
    
    When PAM option is off a different file is compiled, which, since
    version 4.18.3, tries to include crypt.h. Such file is not present in
    FreeBSD. The relevant definitions are in unistd.h.
    
    Fix by adding ifdef to skip such problematic include.
    
    Reported upstream: https://gitlab.xfce.org/apps/xfce4-screensaver/-/merge_requests/29
    
    PR:             277763
---
 x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c b/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c
new file mode 100644
index 000000000000..65dcf88e7068
--- /dev/null
+++ b/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c
@@ -0,0 +1,19 @@
+--- 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>
+ #endif
+ 
+-#ifdef HAVE_LIBCRYPT
+-# include <crypt.h>
+-#else
+-# define crypt(a, b) NULL
++#if !defined(__FreeBSD__)
++# ifdef HAVE_LIBCRYPT
++#  include <crypt.h>
++# else
++#  define crypt(a, b) NULL
++# endif
+ #endif
+ 
+ #ifdef __bsdi__



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