Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Oct 2021 13:35:24 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 4696971b3582 - main - x11/wayland-logout: unbreak build after 620968a43a5f
Message-ID:  <202110011335.191DZObL036815@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

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

commit 4696971b3582e2e5f8248d23f8f7d7778494a271
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-10-01 13:24:23 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-10-01 13:34:43 +0000

    x11/wayland-logout: unbreak build after 620968a43a5f
    
    Partially revert until 12.3 + 3 months for 12.2 EOL (circa 2022Q2).
    https://cgit.freebsd.org/src/commit/?id=925f44f33862
    https://www.freebsd.org/releases/12.3R/schedule/
    
    ../wayland-logout.c:117:26: error: no member named 'cr_pid' in 'struct xucred'; did you mean 'cr_uid'?
        ret = kill(peer_cred.pid, SIGTERM);
                             ^~~
    ../wayland-logout.c:120:65: error: no member named 'cr_pid' in 'struct xucred'; did you mean 'cr_uid'?
            fprintf(stderr, "Error killing pid %d: %m\n", peer_cred.pid);
                                                                    ^~~
    
    Reported by:    antoine
    Pointy hat to:  jbeich
---
 x11/wayland-logout/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11/wayland-logout/Makefile b/x11/wayland-logout/Makefile
index 4348e0509c2f..b2997555523a 100644
--- a/x11/wayland-logout/Makefile
+++ b/x11/wayland-logout/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	bin/${PORTNAME} \
 # Cannot use C implementation without cr_pid
 .if make(makesum)
 DISTFILES=	${DISTNAME:S/${DISTVERSION}/1.3/}${EXTRACT_SUFX}
-.elif ${OPSYS} != FreeBSD
+.elif ${OPSYS} != FreeBSD || ${OSVERSION} < 1202506
 DISTVERSION=	1.3
 NO_ARCH=	yes
 MESON_ARGS+=	-Dimplementation=shell



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