From patchwork Sun Jun 6 11:43:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew James Kraai X-Patchwork-Id: 29964 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C234827BC81; Sun, 6 Jun 2021 12:46:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7C91727BC78 for ; Sun, 6 Jun 2021 12:46:21 +0100 (BST) Received: from localhost ([::1]:54126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lprES-00015o-H7 for patchwork@mira.cbaines.net; Sun, 06 Jun 2021 07:46:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lprEA-00015b-S7 for guix-patches@gnu.org; Sun, 06 Jun 2021 07:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39300) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lprEA-0001bx-Kg for guix-patches@gnu.org; Sun, 06 Jun 2021 07:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lprEA-0003WU-Fz for guix-patches@gnu.org; Sun, 06 Jun 2021 07:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48869] [PATCH] gnu: zile: Update to 2.6.2. Resent-From: Matthew James Kraai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Jun 2021 11:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48869@debbugs.gnu.org Cc: Matthew James Kraai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162297994413514 (code B ref -1); Sun, 06 Jun 2021 11:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2021 11:45:44 +0000 Received: from localhost ([127.0.0.1]:50846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lprDr-0003Vu-OH for submit@debbugs.gnu.org; Sun, 06 Jun 2021 07:45:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:41630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lprDo-0003Vl-5y for submit@debbugs.gnu.org; Sun, 06 Jun 2021 07:45:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lprDn-00013a-Fr for guix-patches@gnu.org; Sun, 06 Jun 2021 07:45:39 -0400 Received: from mail.ftbfs.org ([52.8.68.13]:11144 helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lprDl-0001MH-7Q for guix-patches@gnu.org; Sun, 06 Jun 2021 07:45:39 -0400 Received: from ip68-228-72-85.oc.oc.cox.net ([68.228.72.85] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lprDj-00057R-Kr; Sun, 06 Jun 2021 11:45:35 +0000 From: Matthew James Kraai Date: Sun, 6 Jun 2021 04:43:56 -0700 Message-Id: <20210606114356.14815-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)