GNU bug report logs - #48869
[PATCH] gnu: zile: Update to 2.6.2.

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 48869 in the body.
You can then email your comments to 48869 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: Matthew James Kraai <kraai <at> ftbfs.org>
To: guix-patches <at> gnu.org
Cc: Matthew James Kraai <kraai <at> ftbfs.org>
Subject: [PATCH] gnu: zile: Update to 2.6.2.
Date: Sun,  6 Jun 2021 04:43:56 -0700

* gnu/packages/zile.scm (zile): Update to 2.6.2.
[arguments]: Adjust file list in custom 'patch-/bin/sh phase.
[inputs]: Add gee and glib.
---
 gnu/packages/zile.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm
index c28bc1bdd1..081e9f4a3d 100644
--- a/gnu/packages/zile.scm
+++ b/gnu/packages/zile.scm
@@ -30,7 +30,9 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bdw-gc)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages man)
@@ -42,14 +44,14 @@
 (define-public zile
   (package
     (name "zile")
-    (version "2.4.15")
+    (version "2.6.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/zile/zile-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "0ph3wd0cz3ysdyka6ds2w5l5b89mb5l79kwkfyk7phvq9yih1hrr"))))
+               "0hf788zadmwx0xp1dhrgqcfvhwnarh6h9b51va4dr2y9yfppvsvp"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -58,7 +60,7 @@
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((bash (assoc-ref inputs "bash")))
                ;; Refer to the actual shell.
-               (substitute* '("lib/spawni.c" "src/funcs.c")
+               (substitute* '("src/shell.c")
                  (("/bin/sh")
                   (string-append bash "/bin/sh")))
                #t)))
@@ -76,7 +78,9 @@
     (inputs
      `(("boehm-gc" ,libgc)
        ("ncurses" ,ncurses)
-       ("bash" ,bash)))
+       ("bash" ,bash)
+       ("gee" ,libgee)
+       ("glib" ,glib)))
     (native-inputs
      `(("perl" ,perl)
        ("help2man" ,help2man)
-- 
2.31.1

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

From: Matthew James Kraai <kraai <at> ftbfs.org>
To: 48869 <at> debbugs.gnu.org
Cc: Matthew James Kraai <kraai <at> ftbfs.org>
Subject: [PATCH] gnu: zile: Update to 2.6.2.
Date: Sun,  6 Jun 2021 04:51:00 -0700

* gnu/packages/zile.scm (zile): Update to 2.6.2.
[arguments]: Adjust file list in custom 'patch-/bin/sh phase.
[inputs]: Add gee and glib.
---
 gnu/packages/zile.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm
index c28bc1bdd1..bd5b1e80b0 100644
--- a/gnu/packages/zile.scm
+++ b/gnu/packages/zile.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2016 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2021 Matthew James Kraai <kraai <at> ftbfs.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,7 +31,9 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bdw-gc)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages man)
@@ -42,14 +45,14 @@
 (define-public zile
   (package
     (name "zile")
-    (version "2.4.15")
+    (version "2.6.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/zile/zile-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "0ph3wd0cz3ysdyka6ds2w5l5b89mb5l79kwkfyk7phvq9yih1hrr"))))
+               "0hf788zadmwx0xp1dhrgqcfvhwnarh6h9b51va4dr2y9yfppvsvp"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -58,7 +61,7 @@
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((bash (assoc-ref inputs "bash")))
                ;; Refer to the actual shell.
-               (substitute* '("lib/spawni.c" "src/funcs.c")
+               (substitute* '("src/shell.c")
                  (("/bin/sh")
                   (string-append bash "/bin/sh")))
                #t)))
@@ -76,7 +79,9 @@
     (inputs
      `(("boehm-gc" ,libgc)
        ("ncurses" ,ncurses)
-       ("bash" ,bash)))
+       ("bash" ,bash)
+       ("gee" ,libgee)
+       ("glib" ,glib)))
     (native-inputs
      `(("perl" ,perl)
        ("help2man" ,help2man)
-- 
2.31.1

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

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Matthew James Kraai <kraai <at> ftbfs.org>
Cc: 48869-done <at> debbugs.gnu.org
Subject: Re: bug#48869: [PATCH] gnu: zile: Update to 2.6.2.
Date: Thu, 08 Jul 2021 16:23:43 +0200

Hey,

> * gnu/packages/zile.scm (zile): Update to 2.6.2.
> [arguments]: Adjust file list in custom 'patch-/bin/sh phase.
> [inputs]: Add gee and glib.

Pushed as da40d07066096a3b5a852041ea01fbb32240deda.

Thanks,

Mathieu

Previous Next

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