From patchwork Sun May 18 08:16:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42682 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 1EC8227BC4F; Sun, 18 May 2025 09:19:01 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 0E92427BC4A for ; Sun, 18 May 2025 09:18:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGZDw-0004y9-6u; Sun, 18 May 2025 04:18:20 -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 1uGZDs-0004w0-MO for guix-patches@gnu.org; Sun, 18 May 2025 04:18:16 -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 1uGZDs-0001cM-7n for guix-patches@gnu.org; Sun, 18 May 2025 04:18:16 -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=J6eJ0DMD/bHNdwKT4ZX59j0OKynB1KJNd+dV2AEjSJE=; b=E8KK+Yp6lYLOxu8eeyG1R/jYxRjnWfvr/SFKCt6EtCW7+qBQRKwpKp+DUHhYOZ+1ynsw9gKNWxPl5ZIiFHAD6DifQWjKb2tJvzIS7ImnT+fJq1t8GIezv9xYoivwGeGoScjJAdeb97BryR+Ns805uvNepqFUlzCvlHHlWNw5rJCfKxkjia7ff1ecBSTog7AHpr+yLMJNmMRnUn72ZZvfxv0olhIqEQqVc5y44RMMrtrYajE6XLH3st/HAeN1rHSNctXjuATwYpzkPaw6DSdbtn8nDJmv/OkXX47Dio8QepUQmYuDv1wlX9J4IEF92bWeAA5uedvH9mqNbybyhNqYlg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uGZDs-00027E-2w for guix-patches@gnu.org; Sun, 18 May 2025 04:18:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78315] [PATCH v3 25/53] gnu: emacs-w3m: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 May 2025 08:18:16 +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.17475562887998 (code B ref 78315); Sun, 18 May 2025 08:18:16 +0000 Received: (at 78315) by debbugs.gnu.org; 18 May 2025 08:18:08 +0000 Received: from localhost ([127.0.0.1]:55132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGZDj-00024h-Pk for submit@debbugs.gnu.org; Sun, 18 May 2025 04:18:08 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:51097) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uGZDW-00021S-71 for 78315@debbugs.gnu.org; Sun, 18 May 2025 04:17:55 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4b0YbN6CVpz1ZQP; Sun, 18 May 2025 08:17:52 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78315@debbugs.gnu.org>; Sun, 18 May 2025 08:17:52 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.140.187]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4b0YbN4l1kz5xKP; Sun, 18 May 2025 08:17:52 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 279C0263B4A; Sun, 18 May 2025 08:17:52 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003602c9be0-0d57-4689-891a-345f696af118, C6CD5D64AC962E3586D42D3C4756DC5C3DD92CD7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.207.171.108 Date: Sun, 18 May 2025 10:16:24 +0200 Message-ID: <20250518081658.11362-25-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250518081658.11362-1-ngraves@ngraves.fr> References: <20250518081658.11362-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 10930236296811373282 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdefudektddtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvddtkeelhfeiledugfehleegtdetveekueetudfhtdehteejvedttdffheejueejnecuffhomhgrihhnpehnrghmrgiiuhdrohhrghenucfkphepuddvjedrtddrtddruddpkeelrddvtdejrddujedurddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeefudehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=J6eJ0DMD/bHNdwKT4ZX59j0OKynB1KJNd+dV2AEjSJE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1747556272; v=1; b=iSi+/j1Es/StpZEAL9yDDEOAfF8ejGFmE2oINH128tfH0CgYubGK39Eh19FUV9VLACyhSKlH 7fcN+6Tg9v2CrFbWBb0pScjgpT3mZtKgAOkK6qkn9S3uy7FfsDBrgsZjLau73VLyZtwfEITyJiJ 1sbfcjlXFzgPE5+VoiHwESbSPrXUVpe74Ylf9lEQAwGh+bLASIFgcyc3MeELVLo7dd5S03Ss9yW UQkVrzR2njLIwWP5dywF505ceyLuhh5x31WXdKG/nlnx7KxbLPROxoD5JIOHzlbF/g6z09yZZk6 /tZgM1nYbvYZD0W2SCDuauxY4DVgj8LXedRlwr9YIz6eg== 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 63ba3aa266..c693bd887b 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/")