unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Matthew James Kraai <kraai@ftbfs.org>
To: 48869@debbugs.gnu.org
Cc: Matthew James Kraai <kraai@ftbfs.org>
Subject: [bug#48869] [PATCH] gnu: zile: Update to 2.6.2.
Date: Sun,  6 Jun 2021 04:51:00 -0700	[thread overview]
Message-ID: <20210606115100.15644-1-kraai@ftbfs.org> (raw)
In-Reply-To: <20210606114356.14815-1-kraai@ftbfs.org>

* 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@flashner.co.il>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2021 Matthew James Kraai <kraai@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





  reply	other threads:[~2021-06-06 11:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-06 11:43 [bug#48869] [PATCH] gnu: zile: Update to 2.6.2 Matthew James Kraai
2021-06-06 11:51 ` Matthew James Kraai [this message]
2021-07-08 14:23   ` bug#48869: " Mathieu Othacehe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210606115100.15644-1-kraai@ftbfs.org \
    --to=kraai@ftbfs.org \
    --cc=48869@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).