* [bug#48869] [PATCH] gnu: zile: Update to 2.6.2.
@ 2021-06-06 11:43 Matthew James Kraai
2021-06-06 11:51 ` Matthew James Kraai
0 siblings, 1 reply; 3+ messages in thread
From: Matthew James Kraai @ 2021-06-06 11:43 UTC (permalink / raw)
To: 48869; +Cc: Matthew James Kraai
* 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#48869] [PATCH] gnu: zile: Update to 2.6.2.
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
2021-07-08 14:23 ` bug#48869: " Mathieu Othacehe
0 siblings, 1 reply; 3+ messages in thread
From: Matthew James Kraai @ 2021-06-06 11:51 UTC (permalink / raw)
To: 48869; +Cc: Matthew James Kraai
* 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#48869: [PATCH] gnu: zile: Update to 2.6.2.
2021-06-06 11:51 ` Matthew James Kraai
@ 2021-07-08 14:23 ` Mathieu Othacehe
0 siblings, 0 replies; 3+ messages in thread
From: Mathieu Othacehe @ 2021-07-08 14:23 UTC (permalink / raw)
To: Matthew James Kraai; +Cc: 48869-done
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-08 14:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2021-07-08 14:23 ` bug#48869: " Mathieu Othacehe
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).