From f7511ff1109868d215f5668d8e07e539ef77bd7b Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 30 Nov 2019 03:33:56 +0100
Subject: gnu: readline: Add a version parameter to patch procedures.

* gnu/packages/readline.scm (patch-url, readline-patch, patch-series): Add
VERSION parameter.
(%patch-series-7.0): Pass "7.0" to PATCH-SERIES.
---
 gnu/packages/readline.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/readline.scm')

diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index 57d550d67f..1304bb8b2b 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -30,22 +30,24 @@
   #: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 (patch-url version seqno)
+  (format #f "mirror://gnu/readline/readline-~a-patches/readline~a-~3,'0d"
+          version (string-join (string-split version #\.) "") seqno))
 
-(define (readline-patch seqno sha256)
+(define (readline-patch version seqno sha256)
   "Return the origin of Readline patch SEQNO, with expected hash SHA256"
   (origin
     (method url-fetch)
-    (uri (patch-url seqno))
+    (uri (patch-url version seqno))
     (sha256 sha256)))
 
-(define-syntax-rule (patch-series (seqno hash) ...)
-  (list (readline-patch seqno (base32 hash))
+(define-syntax-rule (patch-series version (seqno hash) ...)
+  (list (readline-patch version seqno (base32 hash))
         ...))
 
 (define %patch-series-7.0
   (patch-series
+   "7.0"
    (1 "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs")
    (2 "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7")
    (3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy")
-- 
cgit v1.2.3


From d7316c774386a79559d557a5cec7f98e345561c6 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 30 Nov 2019 03:37:14 +0100
Subject: gnu: readline: Update to 8.0.1.

* gnu/packages/readline.scm (%patch-series-8.0): New variable.
(readline)[version]: Adjust accordingly.
[source](patches): Add %PATCH-SERIES-8.0.
---
 gnu/packages/readline.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/readline.scm')

diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index 1304bb8b2b..9f886f9b6e 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,6 +46,11 @@
   (list (readline-patch version seqno (base32 hash))
         ...))
 
+(define %patch-series-8.0
+  (patch-series
+   "8.0"
+   (1 "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq")))
+
 (define %patch-series-7.0
   (patch-series
    "7.0"
@@ -57,7 +63,8 @@
 (define-public readline
   (package
     (name "readline")
-    (version "8.0")
+    (version (string-append "8.0."
+                            (number->string (length %patch-series-8.0))))
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/readline/readline-"
@@ -65,7 +72,8 @@
               (sha256
                (base32
                 "0qg4924hf4hg0r0wbx2chswsr08734536fh5iagkd3a7f4czafg3"))
-              (patches (search-patches "readline-link-ncurses.patch"))
+              (patches (append %patch-series-8.0
+                               (search-patches "readline-link-ncurses.patch")))
               (patch-flags '("-p0"))))
     (build-system gnu-build-system)
     (propagated-inputs `(("ncurses" ,ncurses)))
-- 
cgit v1.2.3


From d317d3dfe32a7974163ac3155722afc18b05515d Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 15 Feb 2020 17:47:02 +0100
Subject: gnu: readline: Update to 8.0.4.

* gnu/packages/readline.scm (%patch-series-8.0): Add patches 2 through 4.
---
 gnu/packages/readline.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/readline.scm')

diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index 9f886f9b6e..5f61dcb735 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -49,7 +49,10 @@
 (define %patch-series-8.0
   (patch-series
    "8.0"
-   (1 "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq")))
+   (1 "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq")
+   (2 "1xy8mv8xm8hsfixwp3ci9kfx3dii3y92cq27wwd0jq75y6zzxc1n")
+   (3 "1vza7sxjcsr2z295ij12nzgncdil1vb6as3mqy4m7svi1chv5pcl")
+   (4 "0k1rfx9w32lglxg564yvp0mw6jg6883p8ac2f2lxxqpf80m3vami")))
 
 (define %patch-series-7.0
   (patch-series
-- 
cgit v1.2.3