From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eLV1y-0005jy-UQ for guix-patches@gnu.org; Sun, 03 Dec 2017 09:14:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eLV1u-0007Ab-UC for guix-patches@gnu.org; Sun, 03 Dec 2017 09:14:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33824) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eLV1u-0007AV-Qx for guix-patches@gnu.org; Sun, 03 Dec 2017 09:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eLV1u-0001Fh-Hf for guix-patches@gnu.org; Sun, 03 Dec 2017 09:14:02 -0500 Subject: [bug#29547] [PATCH] gnu: readline: Update to 7.0.3. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eLV1f-0005h3-Qz for guix-patches@gnu.org; Sun, 03 Dec 2017 09:13:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eLV1b-0006sU-Qq for guix-patches@gnu.org; Sun, 03 Dec 2017 09:13:47 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:45751) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eLV1b-0006rY-K8 for guix-patches@gnu.org; Sun, 03 Dec 2017 09:13:43 -0500 From: Marius Bakke Date: Sun, 3 Dec 2017 15:13:33 +0100 Message-Id: <20171203141333.16211-1-mbakke@fastmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29547@debbugs.gnu.org * 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