GNU bug report logs - #29547
[PATCH] gnu: readline: Update to 7.0.3.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 29547 in the body.
You can then email your comments to 29547 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: guix-patches <at> gnu.org
Cc: Marius Bakke <mbakke <at> fastmail.com>
Subject: [PATCH] gnu: readline: Update to 7.0.3.
Date: Sun,  3 Dec 2017 15:13:33 +0100

* gnu/packages/readline.scm (patch-url, readline-patch): New procedures.
(patch-series): New macro.
(%patch-series-7.0): New variable.
(readline)[version]: Include patchlevel.
[source](uri): Adjust to version suffix.
[source](patches): Add %PATCH-SERIES-7.0.
---
 gnu/packages/readline.scm | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index f6ebbcc26..ac99f71ee 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -26,7 +26,28 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (guix utils))
+  #:use-module (guix utils)
+  #:use-module (ice-9 format))
+
+(define (patch-url seqno)
+  (format #f "mirror://gnu/readline/readline-7.0-patches/readline70-~3,'0d" seqno))
+
+(define (readline-patch seqno sha256)
+  "Return the origin of Readline patch SEQNO, with expected hash SHA256"
+  (origin
+    (method url-fetch)
+    (uri (patch-url seqno))
+    (sha256 sha256)))
+
+(define-syntax-rule (patch-series (seqno hash) ...)
+  (list (readline-patch seqno (base32 hash))
+        ...))
+
+(define %patch-series-7.0
+  (patch-series
+   (1 "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs")
+   (2 "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7")
+   (3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy")))
 
 (define-public readline
   (let ((post-install-phase
@@ -42,15 +63,18 @@
                         (find-files lib "\\.a"))))))
     (package
       (name "readline")
-      (version "7.0")
+      (version (string-append "7.0."
+                              (number->string (length %patch-series-7.0))))
       (source (origin
                (method url-fetch)
                (uri (string-append "mirror://gnu/readline/readline-"
-                                   version ".tar.gz"))
+                                   (version-major+minor version) ".tar.gz"))
                (sha256
                 (base32
                  "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm"))
-               (patches (search-patches "readline-link-ncurses.patch"))
+               (patches (append
+                         %patch-series-7.0
+                         (search-patches "readline-link-ncurses.patch")))
                (patch-flags '("-p0"))))
       (build-system gnu-build-system)
       (propagated-inputs `(("ncurses" ,ncurses)))
-- 
2.15.1

Message #8 received at 29547 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 29547 <at> debbugs.gnu.org
Subject: Re: [bug#29547] [PATCH] gnu: readline: Update to 7.0.3.
Date: Sun, 03 Dec 2017 23:23:23 +0100

Marius Bakke <mbakke <at> fastmail.com> writes:

> * gnu/packages/readline.scm (patch-url, readline-patch): New procedures.
> (patch-series): New macro.
> (%patch-series-7.0): New variable.
> (readline)[version]: Include patchlevel.
> [source](uri): Adjust to version suffix.
> [source](patches): Add %PATCH-SERIES-7.0.

This looks fine to me (same as how we treat patches for bash).  Due to
the large number of rebuilds this will cause, however, this has to go to
core-updates.

Thanks!

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

Message #13 received at 29547-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 29547-done <at> debbugs.gnu.org
Subject: Re: [bug#29547] [PATCH] gnu: readline: Update to 7.0.3.
Date: Mon, 04 Dec 2017 13:55:03 +0100

[Message part 1 (text/plain, inline)]

Ricardo Wurmus <rekado <at> elephly.net> writes:

> Marius Bakke <mbakke <at> fastmail.com> writes:
>
>> * gnu/packages/readline.scm (patch-url, readline-patch): New procedures.
>> (patch-series): New macro.
>> (%patch-series-7.0): New variable.
>> (readline)[version]: Include patchlevel.
>> [source](uri): Adjust to version suffix.
>> [source](patches): Add %PATCH-SERIES-7.0.
>
> This looks fine to me (same as how we treat patches for bash).  Due to
> the large number of rebuilds this will cause, however, this has to go to
> core-updates.

Great!  I pushed this as 371193ecbfa3e4e41a7f0e380f7f15c485806e73.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.