From patchwork Thu May 6 02:38:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 29143 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AB84B27BC82; Thu, 6 May 2021 03:40:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2A33927BC81 for ; Thu, 6 May 2021 03:40:10 +0100 (BST) Received: from localhost ([::1]:37532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leTvt-0003Eq-7V for patchwork@mira.cbaines.net; Wed, 05 May 2021 22:40:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leTvm-0003Ek-DR for guix-patches@gnu.org; Wed, 05 May 2021 22:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1leTvm-00019y-4u for guix-patches@gnu.org; Wed, 05 May 2021 22:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1leTvm-0007RI-1M for guix-patches@gnu.org; Wed, 05 May 2021 22:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48220] [PATCH] gnu: xfce4-session: Add xset to propagated-inputs. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 May 2021 02:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48220 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 48220@debbugs.gnu.org Received: via spool by 48220-submit@debbugs.gnu.org id=B48220.162026875128582 (code B ref 48220); Thu, 06 May 2021 02:40:01 +0000 Received: (at 48220) by debbugs.gnu.org; 6 May 2021 02:39:11 +0000 Received: from localhost ([127.0.0.1]:35952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leTux-0007Qw-F6 for submit@debbugs.gnu.org; Wed, 05 May 2021 22:39:11 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:21842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leTuv-0007Qq-7r for 48220@debbugs.gnu.org; Wed, 05 May 2021 22:39:10 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4FbHpH3z8NzQk20; Thu, 6 May 2021 04:39:03 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1620268741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8C+BiHavEy6rD6+a4VDg/RML+exW7U09fx2cJmtm+GY=; b=s9QxxFi/UXguLEi4SDBGDEKBsmQBEraOCFBpUbis9rUO/U4dp6qGLlh4r3lxg7iEdRinPP 0fVlHnyJyGETU3w4lIUZHQMijvld3BtcC4CfhDR5FOilr00/1+9cM6xzdtHTSfMoxKgsoR gdhcQFtgDIK7+JGJUvPyu6hxBRsWJBkDD7abABTt0RXH4t2pNr4LdeDnZjOR0CdwI3+0dJ IVbDseUkuPrOiU/iVJCSMbxKQS7vRzfW28yyD1m/ZPVLvfw2HZgVdxaVkk3Pjy/SjF3Ddb VqmOKQ2gVVhASPXZIuPY8jJ1Plu86TDkDCBvqaJIz74qd/r367VO1AU99OyRBQ== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id XfJoPkIOdQ6Q; Thu, 6 May 2021 04:38:59 +0200 (CEST) Date: Thu, 6 May 2021 04:38:58 +0200 (CEST) From: Brendan Tildesley Message-ID: <615974577.179836.1620268738791@office.mailbox.org> In-Reply-To: <87v97xjoux.fsf@gnu.org> References: <20210504092051.24383-1-mail@brendan.scot> <87v97xjoux.fsf@gnu.org> MIME-Version: 1.0 X-Priority: 3 Importance: Normal X-MBO-SPAM-Probability: X-Rspamd-Score: -6.17 / 15.00 / 15.00 X-Rspamd-Queue-Id: 3C4B017E8 X-Rspamd-UID: aa6372 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches > On 05/05/2021 3:23 PM Ludovic Courtès wrote: > > > Hi Brendan, > > Brendan Tildesley skribis: > > > * gnu/packages/xfce.scm (xfce4-session):[propagated-inputs]: Add xset so > > that xflock4 can turn off the monitor. > > Can’t we instead patch ‘scripts/xflock4’ so that it refers to ‘xset’ by > its absolute file name? > I can. It felt weird just patching one command and not others though. > However, my understanding is that the xset code is already a fallback: > > --8<---------------cut here---------------start------------->8--- > # else run another access locking utility, if installed > for lock_cmd in \ > "xlock -mode blank" \ > "slock" > do > set -- $lock_cmd > if command -v -- $1 >/dev/null 2>&1; then > $lock_cmd >/dev/null 2>&1 & > # turn off display backlight: > xset dpms force off > exit > fi > done > --8<---------------cut here---------------end--------------->8--- > > Probably we should ensure the first ‘for’ loop works as expected. > Perhaps we need to replace ‘xfce4-screensaver-command’ by its absolute > file name there. > Currently xfce4-screensaver is not installed in the xfce package at all by default, so it isn't used. I could add it, but for me it was glitchy/flickering and I would keep clearing the password as I was entering it so I couldn't log back in. It even does it in a VM. I do have a recent amd graphics card with proprietary linux though, my computer can't boot otherwise :(. If you run guix environment --ad-hoc xfce4-screensaver then xfce4-screensaver &; xfce4-screensaver-command --lock does it work for you? I'm not sure what is best, should we be maximal and include xfce4-screensaver in the xfce package, or be minimal and make people have to install it manually? > WDYT? > > Thanks, > Ludo’. From ed66cf50a3b9294effc8bbae04b0f2564bd55c10 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 6 May 2021 12:34:55 +1000 Subject: [PATCH] gnu: xfce4-session: Allow xflock4 to use xset. * gnu/packages/xfce.scm (xfce4-session): [inputs]: Add xset. [arguments]: Add a phase to use exact store path to xset in xflock4. --- gnu/packages/xfce.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 8aa2770ee8..164631cf4d 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -707,7 +707,13 @@ your system in categories, so you can quickly find and launch them.") (list (string-append "--with-xsession-prefix=" %output)) ;; Disable icon cache update. #:make-flags - '("gtk_update_icon_cache=true"))) + '("gtk_update_icon_cache=true") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-xflock + (lambda _ + (substitute* "scripts/xflock4" + (("xset") (which "xset")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) @@ -717,7 +723,8 @@ your system in categories, so you can quickly find and launch them.") ("polkit" ,polkit) ("libsm" ,libsm) ("libwnck" ,libwnck) - ("libxfce4ui" ,libxfce4ui))) + ("libxfce4ui" ,libxfce4ui) + ("xset" ,xset))) (home-page "https://www.xfce.org/") (synopsis "Xfce session manager") (description -- 2.31.1