From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id WI3xKOpPqmJmYwAAbAwnHQ (envelope-from ) for ; Wed, 15 Jun 2022 23:32:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oGn7J+pPqmLWnwAAG6o9tA (envelope-from ) for ; Wed, 15 Jun 2022 23:32:26 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 416E32D516 for ; Wed, 15 Jun 2022 23:32:25 +0200 (CEST) Received: from localhost ([::1]:59104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1ach-0008HB-RM for larch@yhetil.org; Wed, 15 Jun 2022 17:32:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1a9K-0006ol-AA for guix-patches@gnu.org; Wed, 15 Jun 2022 17:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46138) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1a9K-0007XP-1E for guix-patches@gnu.org; Wed, 15 Jun 2022 17:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1a9J-0003gu-VO for guix-patches@gnu.org; Wed, 15 Jun 2022 17:02:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56001] [PATCH] gnu: packages: Fix and update pinfo. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jun 2022 21:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56001@debbugs.gnu.org Cc: "\(" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165532691914177 (code B ref -1); Wed, 15 Jun 2022 21:02:01 +0000 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 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) 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== 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 15 Jun 2022 17:32:14 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" From: "\( via Guix-patches" via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655328745; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Uqh+lfVhqsr/MK3qn0T53fbeZo8VW4MX24F8gwy9POA=; b=BRCfYSghXQnlQCAgIHE/gl+D3gtRRPwzUKUrG5CYfaWTHeimSCb8SUt/lGmMLRbdw4j91Q kYADUxLRWGqWOX9jvpjFeZu/qBgDvUYoxigZwvRCM9hu03Y0EYsPfSVxYqrIspVFXXE4Bl liA++Fcb1LCJ6aaZTZPkMno4SKQv4iFywQjdrLdlybsrZIR6rjBGoPmTFO7uG8Hy/xzmwG ua2oOMKfOfOf6QXSVm/BVSiykAVrtvP7EYIXH3NTlbni73pExu/WSWk7OPeJaNq2V5DP10 4CtqOP/y2Oh/FeDp4MlIhXo8vK408zvSWJ2JqlORAbYKPUZcq7TNQULpeRH7SQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655328745; a=rsa-sha256; cv=none; b=X565QEnTKacDRqo/v+iOXM9/CXAf+ax6GpUhjy8GdQKatnX/l46YpOcN2/zW3h+2T7putj nWaoPpyUvwcYQW9fKLZqjqgJ1yPJhy+67CPqz+R3mmXNqZYPVa1912pmC6LxcMR/34LGmN ATVjr0JpqF94RyPMRUo6R2zbjV7E1acAm/lF6PxGQaOz4UlSjGBSKEs5RqenN56LSKoL5i +RBJUn0J1uOLCVqwF16uJSh6s0UAmCmyeYDxi6UWjG+mvpiqLWIslVIx7ysdTJooLyuNyg RbP7v8Jd6LiMuyquacwok62PGLKZKFzc2J+uvngDbLR4fn+AcOx4FEiZmlJgVg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Uzv5h24L; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.19 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Uzv5h24L; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 416E32D516 X-Spam-Score: -2.19 X-Migadu-Scanner: scn0.migadu.com X-TUID: NIA1/EPRwqr/ * 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