From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 15 17:01:58 2022 Received: (at submit) by debbugs.gnu.org; 15 Jun 2022 21:01:59 +0000 Received: from localhost ([127.0.0.1]:40035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1a9D-0003gY-8j for submit@debbugs.gnu.org; Wed, 15 Jun 2022 17:01:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:56290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1a98-0003gN-LZ for submit@debbugs.gnu.org; Wed, 15 Jun 2022 17:01:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1a98-0006mO-Eb for guix-patches@gnu.org; Wed, 15 Jun 2022 17:01:50 -0400 Received: from knopi.disroot.org ([178.21.23.139]:48690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1a93-0007VF-Uj for guix-patches@gnu.org; Wed, 15 Jun 2022 17:01:50 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B4EBF43DF9; Wed, 15 Jun 2022 23:01:43 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Authentication-Results: disroot.org (amavisd-new); dkim=pass (2048-bit key) header.d=disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rbxiO6Y1oLvB; Wed, 15 Jun 2022 23:01:42 +0200 (CEST) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1655326901; bh=pX9nHqLp6c9gcfwRVRzxhPJmsmFUqwU+jZaEfXxgclA=; h=From:To:Cc:Subject:Date; b=Uzv5h24LENxpr8B5mvtOoeD4r90s4oshB5IQL5Lw8jwim9Xm/DkJDmUbtPxOA7M09 3MbsyHXKXxF27HV7dkhTrzFWnVKmv6EiSrUW9vwaqCRyxGeXQXn+l/jB3IWia/czWS qQiWxnA0YB+Grogwhopfi+DS5cbUO6Vs4tMOIyhPr1mJJ9P6cvIiehHaHRxmkFGd+7 GKYa4EpOVYdiP2nDBWY59F0Ai0lGGAEwq2im29y/c43nTgQSyzKuopH1H3D1VzsLJB wM2mAa4Q9s8NgcVs6jYPYWnRlvlZFYRmmEbqA0IZTE/QG2TgF1HMNuP3tRusmj6+qb lTVBaVTbSRdMg== To: guix-patches@gnu.org Subject: [PATCH] gnu: packages: Fix and update pinfo. Date: Wed, 15 Jun 2022 22:01:32 +0100 Message-Id: <20220615210132.5911-1-paren@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/packages/texinfo.scm (pinfo): Update to commit 3d76eecde211e41ccc28b04e229f159b3f924399. This modification indirectly fixes the build. (For some reason, they had a completely broken commit tagged as the latest version...) --- gnu/packages/texinfo.scm | 79 +++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 42 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index fc1dac9df9..8cf90855a3 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ (define-module (gnu packages texinfo) #:use-module (gnu packages autotools) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix utils) @@ -254,49 +256,42 @@ (define-public texi2html-1.82 (base32 "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n")))))) (define-public pinfo - (package - (name "pinfo") - (version "0.6.13") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/baszoetekouw/pinfo") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-Werror - (lambda _ - (substitute* "configure.ac" - (("-Werror") "")) - #t)) - (add-after 'unpack 'embed-reference-to-clear - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("src/manual.c" - "src/mainfunction.c" - "src/utils.c") - (("\"clear\"") - (string-append "\"" (which "clear") "\""))) - #t))))) - (inputs - (list ncurses readline)) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("libtool" ,libtool) - ("texinfo" ,texinfo))) - (home-page "https://github.com/baszoetekouw/pinfo") - (synopsis "Lynx-style Info file and man page reader") - (description - "Pinfo is an Info file viewer. Pinfo is similar in use to the Lynx web + (let ((commit "3d76eecde211e41ccc28b04e229f159b3f924399") + (revision "0")) + (package + (name "pinfo") + ;; Latest tag is completely broken and does not build. + (version (git-version "0.6.13" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/baszoetekouw/pinfo") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qym323d9my5l4bhw9vry453hhlxhjjvy8mcdi38sk0bqqid0vd1")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'embed-reference-to-clear + (lambda* (#:key inputs #:allow-other-keys) + (let ((ncurses (assoc-ref inputs "ncurses"))) + (substitute* (list "src/manual.c" + "src/mainfunction.c" + "src/utils.c") + (("\"clear\"") + (string-append "\"" ncurses "/bin/clear\""))))))))) + (inputs + (list ncurses readline)) + (native-inputs + (list autoconf automake gettext-minimal libtool texinfo)) + (home-page "https://github.com/baszoetekouw/pinfo") + (synopsis "Lynx-style Info file and man page reader") + (description + "Pinfo is an Info file viewer. Pinfo is similar in use to the Lynx web browser. You just move across info nodes, and select links, follow them, etc. It supports many colors. Pinfo also supports viewing of manual pages -- they are colorized like in the midnight commander's viewer, and additionally they are hypertextualized.") - (license gpl2+))) + (license gpl2+)))) -- 2.36.1