From owner-dev-commits-ports-all@freebsd.org Fri Oct 1 13:35:24 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CEC976AF588; Fri, 1 Oct 2021 13:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HLWMJ5FNDz4RHM; Fri, 1 Oct 2021 13:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 93F682071D; Fri, 1 Oct 2021 13:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 191DZOcJ036816; Fri, 1 Oct 2021 13:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 191DZObL036815; Fri, 1 Oct 2021 13:35:24 GMT (envelope-from git) Date: Fri, 1 Oct 2021 13:35:24 GMT Message-Id: <202110011335.191DZObL036815@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4696971b3582 - main - x11/wayland-logout: unbreak build after 620968a43a5f MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4696971b3582e2e5f8248d23f8f7d7778494a271 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Oct 2021 13:35:24 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4696971b3582e2e5f8248d23f8f7d7778494a271 commit 4696971b3582e2e5f8248d23f8f7d7778494a271 Author: Jan Beich AuthorDate: 2021-10-01 13:24:23 +0000 Commit: Jan Beich 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