From patchwork Fri Aug 26 14:05:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 41975 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 463AC27BBEA; Fri, 26 Aug 2022 15:09:44 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 868C527BBE9 for ; Fri, 26 Aug 2022 15:09:43 +0100 (BST) Received: from localhost ([::1]:51058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRa1m-0003hh-NM for patchwork@mira.cbaines.net; Fri, 26 Aug 2022 10:09:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRZzC-0001On-KS for guix-patches@gnu.org; Fri, 26 Aug 2022 10:07:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36210) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRZzC-0002np-3w for guix-patches@gnu.org; Fri, 26 Aug 2022 10:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oRZzB-0004eB-QW for guix-patches@gnu.org; Fri, 26 Aug 2022 10:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57427] [PATCH] gnu: emacs-polymode: Add patch for native compilation. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Aug 2022 14:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57427 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57427@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166152278617804 (code B ref -1); Fri, 26 Aug 2022 14:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Aug 2022 14:06:26 +0000 Received: from localhost ([127.0.0.1]:54190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRZyc-0004d5-AK for submit@debbugs.gnu.org; Fri, 26 Aug 2022 10:06:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:38130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRZyZ-0004cu-CR for submit@debbugs.gnu.org; Fri, 26 Aug 2022 10:06:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRZyT-0000dE-RG for guix-patches@gnu.org; Fri, 26 Aug 2022 10:06:22 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:37940) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRZyR-0002eP-6x for guix-patches@gnu.org; Fri, 26 Aug 2022 10:06:17 -0400 Date: Fri, 26 Aug 2022 22:05:45 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1661522771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kd17m/FGBe59VKg5FNbR+pm4tvIWrYV5WWdVr2AtJtY=; b=DTC9B0EydTp68ohDvGsG10h+mU5CHYQiLVXHBjKtAcMjV4MMYYmhC9t/TV9KSydKJxvaTS tuwjBFf3JRu+rKCqzb7eUviHqRfjuKjF5Eo+DZXzXBQ7fyibrP+HOHkts2IAjK3/sXLRGT qxJk6IDXqbr2Xt3b3ggWSzJozxeTvsyeZgCZQxnFKdFMJHN2BBM3mLHYVxJCy7+Z+Vvh6C jkgfHusg4XbmS/ZNzCh3fdumiOcyosSoKnQpXCNbdDQQtyZApg6Qf7hmcQBgWzIsp1JMei hfHdTzWVsodhkLn2C+cAyLWi5keueC9HV2rucNrjQGFEisjQtjLn6Q/7CGSd7A== Message-ID: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches From 9615148440a3be38e8763bdd611568761511f0f7 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 26 Aug 2022 21:41:37 +0800 Subject: [PATCH] gnu: emacs-polymode: Add patch for native compilation. * gnu/packages/emacs-xyz.scm (emacs-polymode)[source]: Add patch. * gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 2 + gnu/packages/emacs-xyz.scm | 5 ++- ...-polymode-fix-lexical-variable-error.patch | 37 +++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch base-commit: de2f419618b9929cf65b477568f21bc77e218b70 diff --git a/gnu/local.mk b/gnu/local.mk index 26dfb6afe2..03d5f2ff15 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -51,6 +51,7 @@ # Copyright © 2022 Remco van 't Veer # Copyright © 2022 Artyom V. Poptsov # Copyright © 2022 John Kehayias +# Copyright © 2022 Hilton Chain # # This file is part of GNU Guix. # @@ -1040,6 +1041,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ + %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 379c5fb22c..69fa392eee 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17308,7 +17308,10 @@ (define-public emacs-polymode (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn")))) + (base32 "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn")) + ;; Cherry-picked from upstream, remove when bumping to 0.2.3. + (patches + (search-patches "emacs-polymode-fix-lexical-variable-error.patch")))) (build-system emacs-build-system) (home-page "https://github.com/polymode/polymode") (synopsis "Framework for multiple Emacs modes based on indirect buffers") diff --git a/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch b/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch new file mode 100644 index 0000000000..77a8452c2a --- /dev/null +++ b/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch @@ -0,0 +1,37 @@ +From 8b83fa772a71efc9dc030c43db2cba944e4338c1 Mon Sep 17 00:00:00 2001 +From: Kien Nguyen +Date: Wed, 19 May 2021 23:15:01 +0900 +Subject: [PATCH] Fix using of temporary lexical variable causes error in + native compiling + +--- + polymode-core.el | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/polymode-core.el b/polymode-core.el +index e7d40be..ef316f8 100644 +--- a/polymode-core.el ++++ b/polymode-core.el +@@ -2088,14 +2088,14 @@ Elements of LIST can be either strings or symbols." + (stringp pm--output-file) + (pm--file-mod-time pm--output-file))) + (imt (and omt (pm--file-mod-time pm--input-file))) +- (action (if is-exporter "exporting" "weaving")) + (ofile (if (and imt (time-less-p imt omt)) + (progn + (message "Not re-%s as input file '%s' hasn't changed" +- (file-name-nondirectory ifile) action) ++ (if is-exporter "exporting" "weaving") ++ (file-name-nondirectory ifile)) + pm--output-file) + (message "%s '%s' with '%s' ..." +- (capitalize action) ++ (if is-exporter "EXPORTING" "WEAVING") + (file-name-nondirectory ifile) + (eieio-object-name processor)) + (let ((fn (with-no-warnings + +base-commit: 44265e35161d77f6eaa09388ea2256b89bd5dcc8 +-- +2.37.2 +