Received: by mail.netbsd.org (Postfix, from userid 605) id BC1DE84D31; Sun, 3 May 2020 20:48:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 408E784D2C for ; Sun, 3 May 2020 20:48:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id p67MspKSCtTA for ; Sun, 3 May 2020 20:48:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 94B6884CF1 for ; Sun, 3 May 2020 20:48:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 83735FB27; Sun, 3 May 2020 20:48:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1588538937146490" MIME-Version: 1.0 Date: Sun, 3 May 2020 20:48:57 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/x11/xfce4-session To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20200503204857.83735FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1588538937146490 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Sun May 3 20:48:57 UTC 2020 Modified Files: pkgsrc/x11/xfce4-session: distinfo options.mk pkgsrc/x11/xfce4-session/patches: patch-configure Log Message: xfce4-session: handle a Polkit disabling edge case Allow Polkit support to be disabled even if Polkit is found in the build environment (an atypical use case, indeed, but one I just tripped over). To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/xfce4-session/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xfce4-session/options.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xfce4-session/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1588538937146490 Content-Disposition: inline Content-Length: 3578 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xfce4-session/distinfo diff -u pkgsrc/x11/xfce4-session/distinfo:1.30 pkgsrc/x11/xfce4-session/distinfo:1.31 --- pkgsrc/x11/xfce4-session/distinfo:1.30 Sun Apr 5 22:41:43 2020 +++ pkgsrc/x11/xfce4-session/distinfo Sun May 3 20:48:57 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2020/04/05 22:41:43 gutteridge Exp $ +$NetBSD: distinfo,v 1.31 2020/05/03 20:48:57 gutteridge Exp $ SHA1 (xfce4-session-4.14.2.tar.bz2) = 2af701ae3e7e8990a2b6e58748277913fbe9011d RMD160 (xfce4-session-4.14.2.tar.bz2) = 6f687c6f43fc3eadd35aacd35466e6a8e09118d2 @@ -6,7 +6,7 @@ SHA512 (xfce4-session-4.14.2.tar.bz2) = Size (xfce4-session-4.14.2.tar.bz2) = 841878 bytes SHA1 (patch-ac) = acbb27c79b5b6f37ff106c6cbbc87d00ecfe19f5 SHA1 (patch-config.h.in) = 30e2ae1ea70a99a83f11523e940081b661add69b -SHA1 (patch-configure) = ef67202879c09f5c02700eac8dd451580c612db6 +SHA1 (patch-configure) = 8f46c9acfaf63930ebd771f173cdd86765b91585 SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = da51714e0924a0ab28f7da1b161659763dff81d2 SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097 SHA1 (patch-settings_xfce4-session.xml) = 7e990e73d8dab022f3ebd2d4daa24ebc8dcf95a1 Index: pkgsrc/x11/xfce4-session/options.mk diff -u pkgsrc/x11/xfce4-session/options.mk:1.3 pkgsrc/x11/xfce4-session/options.mk:1.4 --- pkgsrc/x11/xfce4-session/options.mk:1.3 Mon Jun 4 10:51:56 2018 +++ pkgsrc/x11/xfce4-session/options.mk Sun May 3 20:48:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2018/06/04 10:51:56 youri Exp $ +# $NetBSD: options.mk,v 1.4 2020/05/03 20:48:57 gutteridge Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-session PKG_SUPPORTED_OPTIONS= polkit @@ -11,4 +11,8 @@ PLIST_VARS= polkit .if !empty(PKG_OPTIONS:Mpolkit) .include "../../security/mate-polkit/buildlink3.mk" PLIST.polkit= yes +.else +# For the edge case when Polkit is installed on the system, but isn't +# intended to be enabled, we must explicitly disable it. +CONFIGURE_ARGS+= --disable-polkit .endif Index: pkgsrc/x11/xfce4-session/patches/patch-configure diff -u pkgsrc/x11/xfce4-session/patches/patch-configure:1.5 pkgsrc/x11/xfce4-session/patches/patch-configure:1.6 --- pkgsrc/x11/xfce4-session/patches/patch-configure:1.5 Sat Aug 17 19:26:19 2019 +++ pkgsrc/x11/xfce4-session/patches/patch-configure Sun May 3 20:48:57 2020 @@ -1,10 +1,20 @@ -$NetBSD: patch-configure,v 1.5 2019/08/17 19:26:19 gutteridge Exp $ +$NetBSD: patch-configure,v 1.6 2020/05/03 20:48:57 gutteridge Exp $ -Add NetBSD backend detection. +Add NetBSD backend detection. Allow Polkit to be disabled in the build +while still being present in the underlying system. ---- configure.orig 2019-08-11 20:13:50.000000000 +0000 +--- configure.orig 2020-03-28 23:36:34.000000000 +0000 +++ configure -@@ -17802,6 +17802,8 @@ if test x$with_backend = x; then +@@ -17536,7 +17536,7 @@ $as_echo_n "checking for optional packag + $as_echo "disabled" >&6; } + fi + +- if test x"$POLKIT_FOUND" = x"yes"; then ++if test "${disable_polkit+set}" != set && test x"$POLKIT_FOUND" = x"yes"; then + HAVE_POLKIT_TRUE= + HAVE_POLKIT_FALSE='#' + else +@@ -17798,6 +17798,8 @@ if test x$with_backend = x; then with_backend=freebsd ;; #( *-*dragonfly*) : with_backend=freebsd ;; #( @@ -13,7 +23,7 @@ Add NetBSD backend detection. *-openbsd*) : with_backend=openbsd ;; #( *) : -@@ -17831,6 +17833,11 @@ if test x$with_backend = xopenbsd; then +@@ -17827,6 +17829,11 @@ if test x$with_backend = xopenbsd; then $as_echo "#define BACKEND_TYPE_OPENBSD 1" >>confdefs.h fi --_----------=_1588538937146490--