From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +KZVH++2vGARQAAAgWs5BA (envelope-from ) for ; Sun, 06 Jun 2021 13:52:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id ThaLGu+2vGDDcgAA1q6Kng (envelope-from ) for ; Sun, 06 Jun 2021 11:52:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 225BE91A4 for ; Sun, 6 Jun 2021 13:52:15 +0200 (CEST) Received: from localhost ([::1]:55042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lprKA-00021N-5U for larch@yhetil.org; Sun, 06 Jun 2021 07:52:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lprJy-00021B-PA for guix-patches@gnu.org; Sun, 06 Jun 2021 07:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lprJy-0004ww-G1 for guix-patches@gnu.org; Sun, 06 Jun 2021 07:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lprJy-0003fB-5l for guix-patches@gnu.org; Sun, 06 Jun 2021 07:52: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:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48869@debbugs.gnu.org Cc: Matthew James Kraai Received: via spool by 48869-submit@debbugs.gnu.org id=B48869.162298029214041 (code B ref 48869); Sun, 06 Jun 2021 11:52:02 +0000 Received: (at 48869) by debbugs.gnu.org; 6 Jun 2021 11:51:32 +0000 Received: from localhost ([127.0.0.1]:50851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lprJR-0003eM-Dc for submit@debbugs.gnu.org; Sun, 06 Jun 2021 07:51:32 -0400 Received: from mail.ftbfs.org ([52.8.68.13]:57082 helo=aws.ftbfs.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lprJM-0003e7-RA for 48869@debbugs.gnu.org; Sun, 06 Jun 2021 07:51:28 -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 1lprJG-00058z-OO; Sun, 06 Jun 2021 11:51:19 +0000 From: Matthew James Kraai Date: Sun, 6 Jun 2021 04:51:00 -0700 Message-Id: <20210606115100.15644-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210606114356.14815-1-kraai@ftbfs.org> References: <20210606114356.14815-1-kraai@ftbfs.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1622980335; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=OJZ2yTp+KBTuykMUbKVAV9qAFxK8ReUqc4c58LQjrsw=; b=APS/n1ZheUTH9u/5MV/7IQQc+aijYpJVnmd1Q/p1su8DHI7hJUCUtMN+1iTy/PJnps26ku Cp+wsIF8wDms1mQyvfDH79lmiqq5nhRWFv8rZ5yMKZBTmbgdZw4VVBlhQ6z3G9qpxgMQqm hZMvY9iOSlidrWFo4exfbekjSsA5Ezr7vag1U/py+nGhnpArgBNBtsDKojuccs2aJK1p2M gLVChyEDCJcxzm6FBvJmrrOLJewhWhGuksPER3uDY9fTYd8ekfYdmkE9oqAJ3vb5obbZA9 dhVwG7IOCPIivx5DQLSA6SzD41iGr+jx3uFOAuzwwitpZsVZ5KVwSdFQJ8geTw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622980335; a=rsa-sha256; cv=none; b=eGH1WK5txI7417fhnlY2YiIGIONXgz4qGCwEfSQfGVH4Qw16fYpta0Yh2dzi4DLRJGKr+G dn3Xgi3551X2e7uA7ZUzC0L5sPjhNfRwRH6ldcduICX+307hhIN68XPpLhO+hHyJiKQAtP sloo6FJlEpnsZTDbukgwox5aip6zuD5rZRYCti/eDT1eP3HyMVvJbVu6tBv36j3ogVwuRp hO2R4WohYfHWadiDE7w6ugRlaHtA8Tv0dHHTgT62CUNYEimnsUtFfejtNw+E64GhHz0A10 OZAsaGng55dJg+3yFvvHiYJtaLi7N476xD6MFHBnp0fzFUYB3TR5R5rcRX3W6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.43 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 225BE91A4 X-Spam-Score: -1.43 X-Migadu-Scanner: scn1.migadu.com X-TUID: 1VrcCiknSsGf * 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 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Matthew James Kraai ;;; ;;; 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