From patchwork Tue Apr 12 11:06:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "B. Wilson" X-Patchwork-Id: 38536 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 6C0F827BBEA; Tue, 12 Apr 2022 12:10:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,MSGID_MULTIPLE_AT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 99A9C27BBE9 for ; Tue, 12 Apr 2022 12:10:23 +0100 (BST) Received: from localhost ([::1]:53662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neEPe-00015K-Jy for patchwork@mira.cbaines.net; Tue, 12 Apr 2022 07:10:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neENO-0005ox-PB for guix-patches@gnu.org; Tue, 12 Apr 2022 07:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53866) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neENO-0005PO-BG for guix-patches@gnu.org; Tue, 12 Apr 2022 07:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1neENO-0003FQ-4K for guix-patches@gnu.org; Tue, 12 Apr 2022 07:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54881] gnu: Add ncurses-5, ncurses/tinfo-5. Resent-From: "B. Wilson" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Apr 2022 11:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54881 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 54881@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164976162512375 (code B ref -1); Tue, 12 Apr 2022 11:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Apr 2022 11:07:05 +0000 Received: from localhost ([127.0.0.1]:47758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neEMN-0003D9-UD for submit@debbugs.gnu.org; Tue, 12 Apr 2022 07:07:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:60566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neEMK-0003Cx-VR for submit@debbugs.gnu.org; Tue, 12 Apr 2022 07:06:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neEMH-0003Ks-Lm for guix-patches@gnu.org; Tue, 12 Apr 2022 07:06:54 -0400 Received: from m42-5.mailgun.net ([69.72.42.5]:25534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neEMF-0005DO-Kx for guix-patches@gnu.org; Tue, 12 Apr 2022 07:06:53 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.wilsonb.com; q=dns/txt; s=krs; t=1649761611; h=Content-Type: MIME-Version: Message-Id: Subject: Subject: From: From: To: To: Date: Sender: Sender; bh=F1Bv6qTrdoBi/+FTsfsUFtcRunbMXwT0bQId+pHYY7M=; b=DPwqVc9WDgBV6PD1T320XMWB7NGP/wtrH3QspRf028fqK82jYZZ0OsQE6o8GRPZGm4M3q37N zluGEsC2MqU15UV7vFl2l1z5vgb6lqGV4kNkOshJDDkC2jyVA2eWfWIbf0lRl2ndE5hfLWsk hnnpmWct/Bgh92ueSIHWKDjKWxlCUJWDn+8okdEBBPM1OvclawAY+1ogdUHCwRr5crdBnSlJ mZAaXtxvDNXeFd5n/JSotqiAB9mctOIC6b99vDz+gld9qexA/zoN76IXkuIfQKM+ab5zsA2a BBXEuGGQzgcMMbTVr8OLEclDOs/MRs+lCzVILJJeIQ1YyNcjVEQEQQ== X-Mailgun-Sending-Ip: 69.72.42.5 X-Mailgun-Sid: WyI5MmEzMyIsICJndWl4LXBhdGNoZXNAZ251Lm9yZyIsICIwODU0N2EiXQ== Received: from wilsonb.com (wilsonb.com [104.199.203.42]) by smtp-out-n01.prod.us-west-2.postgun.com with SMTP id 62555d4ac172fc506609efb5 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Tue, 12 Apr 2022 11:06:50 GMT Received: from localhost (aj168213.dynamic.ppp.asahi-net.or.jp [220.150.168.213]) by wilsonb.com (Postfix) with ESMTPSA id DF672A0526 for ; Tue, 12 Apr 2022 11:06:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wilsonb.com; s=201703; t=1649761608; bh=F1Bv6qTrdoBi/+FTsfsUFtcRunbMXwT0bQId+pHYY7M=; h=Date:To:From:Subject:From; b=IjgxH05L451yuIvCBZDoapE7xCVFwh+nn7s14gcamvrtF2i+ic40W+WTJO9n3bBMt u774cn6teIyRD2OHm/rZ9HlWaMfmK35bZNhqnKjApapATbMhSjUypxDsqEWvgu6858 msdaBQC9JsPKG8mX8TZcGuAQZCru87hWcrtXsyv32v/hj9LFND5HFxkl8649E7q2/l thQKYrHQ28QiajAd49dkRkvND9rmNaiC1wZEx8MaprTmlKuUaaeYvMw1tXOUj58LY9 8Ns6sPO5UJhLBxBn6AS9NQB/R9q6CZqDPseNxmWk8EwZ051ZI/X7T4n20d0WfLa36q NuzsDOjLr8ctP4CLGFmX6CAlcXJSkIh+p5EEECDM8sAhZ3434tmAixLFK19ZenNeRq 7ZOr2Ko8GXe2I5oz8kzpOc3RGGI/QBVfYwfjYTk1+WbvheS8sHRSFUGZIAaf7dHtbj Y8gQ2sOF3OXnpvP0Zdap935EfXSWm5AT+NMKHuzcO1jFnW8bwCCbMfeUGtLqOXB9O5 jnG6mS3eGSXUYi5oNa4WM7g8eHb0bhGD0glX7yfP4Mjw2aNK/pVXtFsR9/UfAhWiXX 2uLawMiEIon494WVw+U/yEg5A8Q83Ce1YadSTVl0S5CPBWixv6eblTdzIUf5/1hvL3 V5nHaww8BV8wTEpCG/fBvwi4= Date: Tue, 12 Apr 2022 20:06:45 +0900 Message-Id: <2AOSR0ZNKROP0.2ALNTRXGSLUNC@"@WILSONB.COM> User-Agent: mblaze/1.2 MIME-Version: 1.0 Received-SPF: pass client-ip=69.72.42.5; envelope-from=bounce+686de0.08547a-guix-patches=gnu.org@mg.wilsonb.com; helo=m42-5.mailgun.net X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, MSGID_MULTIPLE_AT=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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" Reply-to: "B. Wilson" X-ACL-Warn: , "B. Wilson via Guix-patches" X-Patchwork-Original-From: "B. Wilson via Guix-patches" via From: "B. Wilson" X-getmail-retrieved-from-mailbox: Patches Hello Guix, I have a need to use ncurses-with-tinfo@5. The ncurses package embeds the version string in various places, and even hard-codes the version-major 6 in a couple places, making it impractical to just create a transformation. Is this patch reasonable? From 8ed5fceb8b0bcbfc39505b4a74bb7eed93dfdaf9 Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Tue, 12 Apr 2022 12:09:26 +0900 Subject: [PATCH] gnu: Add ncurses-5, ncurses/tinfo-5 To: guix-patches@gnu.org * gnu/packages/ncurses.scm (ncurses-5, ncurses/tinfo-5): New varaibles. --- gnu/packages/ncurses.scm | 49 ++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 5b00da25bb..afca7b0208 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -39,18 +39,19 @@ (define-module (gnu packages ncurses) #:use-module (guix utils) #:use-module (ice-9 match)) -(define-public ncurses +(define* (make-ncurses-package #:key + version + source-hash + rollup-patch-hash) (package (name "ncurses") - (version "6.2.20210619") + (version version) (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ncurses/ncurses-" (version-major+minor version) ".tar.gz")) - (sha256 - (base32 - "17bcm2z1rdx5gmzj5fb8cp7f28aw5b4g2z4qvvqg3yg0fq66wc1h")))) + (sha256 (base32 source-hash)))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1 MiB of man pages @@ -130,10 +131,12 @@ (define lib.a (string-append "lib" lib ".a")) ,@(if (not (target-mingw?)) - '((define libw.so.x - (string-append "lib" lib "w.so.6")) + `((define libw.so.x + (string-append "lib" lib "w.so." + ,(version-major version))) (define lib.so.x - (string-append "lib" lib ".so.6")) + (string-append "lib" lib ".so." + ,(version-major version))) (define lib.so (string-append "lib" lib ".so")) (define packagew.pc @@ -192,7 +195,9 @@ (define package.pc "cf_cv_ld_searchpath=/no-ld-searchpath" ;; MinGW: Use term-driver created for the MinGW port. - ,@(if (target-mingw?) '("--enable-term-driver") '())))) + ,@(if (target-mingw?) '("--enable-term-driver") '()) + + ,@extra-configure-flags))) #:tests? #f ; no "check" target #:phases (modify-phases %standard-phases (add-after 'unpack 'apply-rollup-patch @@ -216,9 +221,7 @@ (define package.pc (string-append "https://invisible-mirror.net/archives" "/ncurses/" major "." minor "/ncurses-" major "." minor "-" point "-patch.sh.bz2")))) - (sha256 - (base32 - "1b6522cvi4066bgh9lp93q8lk93zcjjssvnw1512z447xvazy2y6")))) + (sha256 (base32 rollup-patch-hash)))) ("pkg-config" ,pkg-config))) (native-search-paths (list (search-path-specification @@ -234,6 +237,18 @@ (define package.pc (license x11) (home-page "https://www.gnu.org/software/ncurses/"))) +(define-public ncurses + (make-ncurses-package + #:version "6.2.20210619" + #:source-hash "17bcm2z1rdx5gmzj5fb8cp7f28aw5b4g2z4qvvqg3yg0fq66wc1h" + #:rollup-patch-hash "1b6522cvi4066bgh9lp93q8lk93zcjjssvnw1512z447xvazy2y6")) + +(define-public ncurses-5 + (make-ncurses-package + #:version "5.9.20141206" + #:source-hash "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh" + #:rollup-patch-hash "16ny892yhimy6r4mmsgw3rcl0i15570ifn9c54g1ndyrk7kpmlgs")) + (define-public ncurses/gpm (package/inherit ncurses (name "ncurses-with-gpm") @@ -258,6 +273,16 @@ (define-public ncurses/tinfo `(cons "--with-termlib=tinfo" ,cf)))))) +;; Consider merging into ncurses for next core-updates cycle. +(define-public ncurses/tinfo-5 + (package/inherit ncurses-5 + (name "ncurses-with-tinfo") + (arguments + (substitute-keyword-arguments (package-arguments ncurses-5) + ((#:configure-flags cf) + `(cons "--with-termlib=tinfo" + ,cf)))))) + (define-public dialog (package (name "dialog") -- 2.35.1