From patchwork Tue Feb 22 09:16:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 37396 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 34E1C27BBEA; Tue, 22 Feb 2022 09:21:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE07D27BBE9 for ; Tue, 22 Feb 2022 09:21:58 +0000 (GMT) Received: from localhost ([::1]:48810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMRMr-00055U-P5 for patchwork@mira.cbaines.net; Tue, 22 Feb 2022 04:21:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMRJ5-0002kv-1Z for guix-patches@gnu.org; Tue, 22 Feb 2022 04:18:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46101) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMRJ4-0003i6-Nz for guix-patches@gnu.org; Tue, 22 Feb 2022 04:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nMRJ4-0002Mi-Cb for guix-patches@gnu.org; Tue, 22 Feb 2022 04:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53920] [PATCH v2] gnu: lesspipe: Update to 2.02. References: <639f99264ee673157112aec54d28c80842e4be52.1644511905.git.h.goebel@crazy-compilers.com> In-Reply-To: <639f99264ee673157112aec54d28c80842e4be52.1644511905.git.h.goebel@crazy-compilers.com> Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 09:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53920 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 53920@debbugs.gnu.org Received: via spool by 53920-submit@debbugs.gnu.org id=B53920.16455214349026 (code B ref 53920); Tue, 22 Feb 2022 09:18:02 +0000 Received: (at 53920) by debbugs.gnu.org; 22 Feb 2022 09:17:14 +0000 Received: from localhost ([127.0.0.1]:39998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMRIE-0002LS-D0 for submit@debbugs.gnu.org; Tue, 22 Feb 2022 04:17:14 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:49005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMRIC-0002LD-Oc for 53920@debbugs.gnu.org; Tue, 22 Feb 2022 04:17:09 -0500 Received: from hermia.goebel-consult.de ([79.211.184.220]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MHX7f-1nR68V2WeH-00DYfh for <53920@debbugs.gnu.org>; Tue, 22 Feb 2022 10:17:02 +0100 Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 2FD415F564; Tue, 22 Feb 2022 10:17:03 +0100 (CET) From: Hartmut Goebel Date: Tue, 22 Feb 2022 10:16:59 +0100 Message-Id: <0055cb8be0309c568de5743dbd4addcb5f583f84.1645521332.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:6SDuR+e8DD7RxJwPME2ufCoo74+/FHkaFCWsK5xe2a1pOzIixqH KWkR0u6IiDDwwXfy5eyBTM07RsNdkZnJPBlxUcSv+j6PoR47FsZf3xDd/kFHLttNDPxLvB0 ACvLBuW6rl/+xICoM/3NHZQDsIKdXrr5YSXG9Itc28fHHk4gI9SwH77ez6okXw8vtxcRbEV lir92PTIi15eEZJnK7ElA== X-UI-Out-Filterresults: notjunk:1;V03:K0:M++38oWy3c4=:TQRtgvT2SwUD++P5zDAXaM 7HL0/xTtkZvl6iz+4O8lEgBS/SbWiRaOnnLk1WGvWi1coja1rmI99DsSlMOPRUf+JmxpXIYQS fM9Ry+QA3ALsbfaPeGzult10/5c3s/gKchOT+OM5igMd4CDbBgqugQKnGjnHUB7BU/hvY9NRV c16imBJ3eVdYF48WLtCP3+17RZL9aMdDPltU8J2BvkAlThPwAJvnN9tN4etPd/NAT6ApuRGin QNGCWux/dfgkYRBKHPzTOcmew6qS2WIPsDHWYY5pi9qw9dFuW83vYRa4NAimXlkc7GVosf/wx 8UJ/hKUSFtp/3uma9io/RdZQHFPeDmtHiVLXJSfxrITHrzK0ZgpaUB2w3brth1aSzDGDM++Bq QA+MGX0H0eN3repQZeN5RPYPqb7cjlqqs1Jy2U99l7Ho1ChD8wFHJttZ+xF6JaAXgzry/MFMC H6YqMwRyUeHjoM0/tvxoX15mPQlqN5l6fhmmZ/j7RfiaTcdrzOl37BvfNvjGdu1tQ97JgkpIO E7FAh4W0UkBERedtyjTTLo+2KmjeHM58Qi3fvEk8xmk18AU99kyCC5i38Un8cQPBmysQCYvkf cQu1+2x1VV8tlMiZpxJ/0g4KdQiTga11fvtR+xnRczrqE2HPy2UZqtDIvdAJ/5hpmGAIFc+1z I5XqLKzzmO4/By4BcUCQmLNdLzq5AUuUelQKBceaubq9Otf0LcRmR0sj59k2U0csUS0oEavJb pGypEuEqD/8/7Dz2 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 * gnu/packages/less.scm (lesspipe): Update to 2.02. [arguments]{configure} Adjust to updated source. {fix-makefile}: New phase. {patch-tput-and-file}: rename into … {patch-command-paths}: this; patch other relevant scripts. --- gnu/packages/less.scm | 58 +++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm index e23b5d0c24..a9775ecdf0 100644 --- a/gnu/packages/less.scm +++ b/gnu/packages/less.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Michael Rohleder +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,38 +60,53 @@ text editors.") (define-public lesspipe (package (name "lesspipe") - (version "1.91") + (version "2.02") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/wofr06/lesspipe") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "04dqvq6j4h451xqbvxzv6pv679hzzfm39pdm5vg7h3r45gzg0kps")))) + "15lcgawwqlpwa3kra44nnyx0jmidjqdq45xcr5q90kz8iqix3ll7")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests - #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file "Makefile") ; force generating - (invoke "./configure" - (string-append "--prefix=" out) - "--yes")))) - (add-before 'install 'patch-tput-and-file - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lesspipe.sh" - (("tput colors") - (string-append (search-input-file inputs "/bin/tput") - " colors")) - (("file -") - (string-append (search-input-file inputs "/bin/file") - " -")))))))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; configure is a perl script which the standard configure phase + ;; fails to execute + (invoke "./configure" + (string-append "--prefix=" (assoc-ref outputs "out"))))) + (add-before 'install 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("\\$\\(DESTDIR\\)/etc") "$(DESTDIR)$(PREFIX)/etc")))) + (add-before 'install 'patch-command-paths + ;; Depending on the content of the file to be displayed and some + ;; settings, lesspipe trees to use a large variety of external + ;; commands, e.g. rpm, dpkg, vimcolor. We only link the essential + ;; ones to avoid this package to pull in all these dependencies + ;; which might never ever we used. + (lambda* (#:key inputs #:allow-other-keys) + (let ((file (search-input-file inputs "/bin/file")) + (tput (search-input-file inputs "/bin/tput"))) + (substitute* "sxw2txt" + (("^use warnings;" line) + (string-append line "use lib '" file "';"))) + (substitute* "lesscomplete" + (("file -") (string-append file " -"))) + (substitute* "lesspipe.sh" + (("tput colors") + (string-append tput " colors")) + (("file -") + (string-append file " -"))))))))) (inputs - (list file ncurses)) ; for tput + (list file + ncurses)) ; for tput (native-inputs (list perl)) (home-page "https://github.com/wofr06/lesspipe") (synopsis "Input filter for less")