From patchwork Thu May 8 12:50:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42426 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 9949C27BC4A; Thu, 8 May 2025 13:53:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D61D27BC4B for ; Thu, 8 May 2025 13:53:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uD0jj-0007Ly-RB; Thu, 08 May 2025 08:52:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uD0jc-0007Ih-RH for guix-patches@gnu.org; Thu, 08 May 2025 08:52:20 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD0jc-0005vE-HO for guix-patches@gnu.org; Thu, 08 May 2025 08:52:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=xuRjpfLY0cBoTifCFaZXSoQo69VrfQu9yysw6eYTZfw=; b=n/ZSl0LGINhWoxPXwwogZOQG5fjz+PwVsI98heY46FJoVmtCG/0W8hKA3FOqowiMcpvDqsPFeEs7MgpgxwuD/cW/YnVBL0O80ZoZBR/lEq1XexEVgd1sDtYOpYnbiN5yDdimf5AFtv7msmyLVKVoE88iSZTPSaT7FrcFDMapMztuILJjDGKWeKdywJwR6cNIf/c83hQ4CbXmyA81WEUjmXMFHpChpN2BrsGMTCatsIx8yzZ+yzuRT9HRheRc3uqhV6yiBNHbWYOp22X5LzlZIajGgc2KPe/6nppgIuGlQEURydTKYTzEjhDJXA6I/rc8raWHIkHmdcCn3HrglElHmw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uD0jc-0001YA-8H for guix-patches@gnu.org; Thu, 08 May 2025 08:52:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78315] [PATCH 25/53] gnu: emacs-w3m: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 12:52:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78315-submit@debbugs.gnu.org id=B78315.17467087235590 (code B ref 78315); Thu, 08 May 2025 12:52:20 +0000 Received: (at 78315) by debbugs.gnu.org; 8 May 2025 12:52:03 +0000 Received: from localhost ([127.0.0.1]:55440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uD0jJ-0001Rd-KF for submit@debbugs.gnu.org; Thu, 08 May 2025 08:52:03 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:43651) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uD0iw-0001M2-Py for 78315@debbugs.gnu.org; Thu, 08 May 2025 08:51:40 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZtX7s64DQz1gj0; Thu, 8 May 2025 12:51:37 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78315@debbugs.gnu.org>; Thu, 8 May 2025 12:51:37 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.90]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZtX7s587Yz2Cdv; Thu, 8 May 2025 12:51:37 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 6712DBA400A; Thu, 8 May 2025 12:51:37 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G00567523b28-ae55-47e6-befa-71d5f07e1243, DDC873FDB2A8922E808BA1EA95701B978C004A90) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Thu, 8 May 2025 14:50:27 +0200 Message-ID: <20250508125104.26530-25-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250508125104.26530-1-ngraves@ngraves.fr> References: <20250508125104.26530-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12166755871749825250 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeeljeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvddtkeelhfeiledugfehleegtdetveekueetudfhtdehteejvedttdffheejueejnecuffhomhgrihhnpehnrghmrgiiuhdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=xuRjpfLY0cBoTifCFaZXSoQo69VrfQu9yysw6eYTZfw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1746708697; v=1; b=E3Cr5k71/5ArgJtA4jgmDcgDg9rRXWd9efc3/ih5iQc7NdjMneOo1S9twse5/flIri1aJdrh ANU4Is1eKFHdEq4hRCBeIIuS2PE0e5hwszD+352gAcstGhboGLU5H5wR4msJzgrnq05MSODdUAS H9us5Hy+GqpLl2cz/1r7alSkt0t0qlPNzk8K1txEshtt4BQe/TdGK966UsZLA+zyzj3CYOwDfxP csB5SnDKtTIDhRjA/gXK6XXBg3UqvDkGi6JKvnslMrg0rPr8e/PpeAuZdj3460jXerN4Anjd4L+ mg8ZzCO8Lc1JFRiTzCQcLlSu2WEDBHH7IA15//VP4d+Nw== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-w3m): [arguments]: Use gexps. --- gnu/packages/emacs-xyz.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a8497dbdaa..6eaf571f78 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4062,25 +4062,23 @@ (define-public emacs-w3m (substitute* "configure" (("EMACS_FLAVOR=unsupported") "EMACS_FLAVOR=emacs")))) (add-before 'build 'patch-exec-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (make-file-writable "w3m.el") - (emacs-substitute-variables "w3m.el" - ("w3m-command" (search-input-file inputs "/bin/w3m")) - ("w3m-touch-command" (search-input-file inputs "/bin/touch")) - ("w3m-icon-directory" - (string-append out "/share/images/emacs-w3m"))) - (make-file-writable "w3m-image.el") - (emacs-substitute-variables "w3m-image.el" - ("w3m-imagick-convert-program" - (search-input-file inputs "/bin/convert")) - ("w3m-imagick-identify-program" - (search-input-file inputs "/bin/identify")))))) + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "w3m.el") + (emacs-substitute-variables "w3m.el" + ("w3m-command" (search-input-file inputs "/bin/w3m")) + ("w3m-touch-command" (search-input-file inputs "/bin/touch")) + ("w3m-icon-directory" + (string-append #$output "/share/images/emacs-w3m"))) + (make-file-writable "w3m-image.el") + (emacs-substitute-variables "w3m-image.el" + ("w3m-imagick-convert-program" + (search-input-file inputs "/bin/convert")) + ("w3m-imagick-identify-program" + (search-input-file inputs "/bin/identify"))))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ (invoke "make" "install" "install-icons") - (with-directory-excursion - (emacs:elpa-directory (assoc-ref outputs "out")) + (with-directory-excursion (emacs:elpa-directory #$output) (for-each delete-file '("ChangeLog" "ChangeLog.1")) (symlink "w3m-load.el" "w3m-autoloads.el"))))))) (home-page "http://emacs-w3m.namazu.org/")