Received: (at submit) by debbugs.gnu.org; 10 Mar 2021 12:14:43 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 10 07:14:43 2021 Received: from localhost ([127.0.0.1]:49060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1lJxjf-0000qx-3I for submit <at> debbugs.gnu.org; Wed, 10 Mar 2021 07:14:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:55376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maximedevos@HIDDEN>) id 1lJxja-0000ql-E7 for submit <at> debbugs.gnu.org; Wed, 10 Mar 2021 07:14:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <maximedevos@HIDDEN>) id 1lJxja-00066I-0F for guix-patches@HIDDEN; Wed, 10 Mar 2021 07:14:38 -0500 Received: from andre.telenet-ops.be ([2a02:1800:120:4::f00:15]:53444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <maximedevos@HIDDEN>) id 1lJxjX-0005O1-SG for guix-patches@HIDDEN; Wed, 10 Mar 2021 07:14:37 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id ecEY240010mfAB401cEYuG; Wed, 10 Mar 2021 13:14:32 +0100 Message-ID: <6e6e113e6843516a368f6abff5a536739cd99959.camel@HIDDEN> Subject: [PATCH] gnu: xvfb-run: Fix =?UTF-8?Q?=E2=80=98xvfb-run?= =?UTF-8?Q?_--help=E2=80=99?= in a pure environment. From: Maxime Devos <maximedevos@HIDDEN> To: guix-patches@HIDDEN Content-Type: text/plain; charset="UTF-8" Date: Wed, 10 Mar 2021 13:14:15 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.34.2 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1615378472; bh=WzSSr0CofhRvR/cNvbALmUH9N0PnN8ynKOlhZgm2dks=; h=Subject:From:To:Date; b=Z8t1eQ0HCLKDH6AxQnKSzmLV30vX/tV4wliUf8WArh6kW4TMr/K6x042PvFgBuFD9 QCOADw/r8g+ClUy+ocqNVhfxBiQaP+OZ/ytmMqWGpZXlOjCw+ORpxa0Kusvuxs2JBV 4Bicywhgq2S3x0PCBSNRNv00wF7BGsevlWVxCX5CVcLGAJ0W294rQJOMzLuazkVN+I Po24LB2k+0aA5/oGm7P+RXr1QY4EBCELsGn1p8AyYosOIgT5T4D9lbf4fH3rFgVZGi uaDaTljSvO5RI4cQycUlfJN7zHMLU7R/cf8JRINY4AJ+UgAanuXjg/ixoshLo5+R1d Cuil/1EoAhQgg== Received-SPF: pass client-ip=2a02:1800:120:4::f00:15; envelope-from=maximedevos@HIDDEN; helo=andre.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) * gnu/packages/xorg.scm (xvfb-run)[arguments]: Refer to ‘cat’ by absolute file name, and test whether ‘xvfb-run --help’ succeeds in a pure environment in the ‘check’ phase. --- gnu/packages/xorg.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 92ae6a824b..392a4f7c44 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020, 2021 Michael Rohleder <mike@HIDDEN> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@HIDDEN> ;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@HIDDEN> +;;; Copyright © 2021 Maxime Devos <maximedevos@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -6799,7 +6800,7 @@ box, and a calendar. It uses GTK+, and will match your desktop theme.") (lambda _ (chmod "xvfb-run" #o755) (substitute* "xvfb-run" - (("(\\(| )(fmt|stty|awk|kill|getopt|mktemp|touch|rm|mcookie)" + (("(\\(| )(fmt|stty|awk|cat|kill|getopt|mktemp|touch|rm|mcookie)" _ prefix command) (string-append prefix (which command))) ;; These also feature in UI messages, so be more strict. @@ -6808,13 +6809,15 @@ box, and a calendar. It uses GTK+, and will match your desktop theme.") (string-append prefix (which command)))))) (replace 'check ;; There are no tests included. Here we test whether we can run - ;; a simple client without xvfb-run itself relying on $PATH. + ;; a simple client and whether xvfb-run --help succeeds + ;; without xvfb-run itself relying on $PATH. (lambda* (#:key tests? #:allow-other-keys) (when tests? (let ((old-PATH (getenv "PATH")) (xterm (which "xterm"))) (unsetenv "PATH") (invoke "./xvfb-run" xterm "-e" "true") + (invoke "./xvfb-run" "--help") (setenv "PATH" old-PATH))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys)
Maxime Devos <maximedevos@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#47044
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.