From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yCevMyjUCGMc0wAAbAwnHQ (envelope-from ) for ; Fri, 26 Aug 2022 16:09:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EBGcMyjUCGPyQQEA9RJhRA (envelope-from ) for ; Fri, 26 Aug 2022 16:09:44 +0200 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 5BCFE3D3BB for ; Fri, 26 Aug 2022 16:09:44 +0200 (CEST) Received: from localhost ([::1]:51058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRa1n-0003hh-HS for larch@yhetil.org; Fri, 26 Aug 2022 10:09:43 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1661522984; h=from:from:sender:sender:reply-to: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:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Kd17m/FGBe59VKg5FNbR+pm4tvIWrYV5WWdVr2AtJtY=; b=ARgJmRaDzSL/li2y92I3tFrkK0MvxCchZcC4/FFEGY0ArifDR40vaLp8Xa6F6kya+wakEZ 4QUbHg3QIm/g6TYinT40jgwzERzqmziaakGkBdB0sixGVJ5iO8Ydpyk1ASkm8q6bd6zW51 Ygxzg7hJ/m+rizhnK8t5cTTKhFTSLMkNIqcAvgn3/ks9IQsUIU2M41zVyu26UbgsBiIPeR RlXBteDuCvKl6tH/NFnCz+y2ga7bI4vYwAKs7pTQdMJAYzcTin7orjgIq5Yvb2OHttGL40 iH7jajkofk8VlMxQfsdGoJlhyjbN20TuPK6sY2lPv9djQa8zarIOqI44QjNIGg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1661522984; a=rsa-sha256; cv=none; b=RXr5YzAaVrcsg63iUgmrrcMKEpYP+T9d6i3FYDdvpHIDVC7wLY3KSqNjs1grPRsbecyiVv LTXXQSGWH+MMtqxsPeHVm6cXxFhiJZ2kKRuAWWZa4pjkicM0t4+qz9cZKuBkaiFI9cS9Sr r5vOkUL1vVw2O4F/Y3TUEjE8qqMj8N64hL86Sg8NRlCF6+QyP/8HhIk+xSspcAIRsgumr0 JuhtupCGRCq2wypuJ2jB4sEKZxFc+p1J8KHJR2tDdWAEHY5gojvzYBr+W7bBWgCABnxEFb aj9SB93S1IfIGyDregwenW9V0bZR7j3oXIAIG90PvWrO0WNO3FH20a1/cfz/nA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=DTC9B0Ey; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=DTC9B0Ey; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 5BCFE3D3BB X-Spam-Score: -4.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: gyGcTy1mKp40 =46rom 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-variabl= e-error.patch 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 =C2=A9 2022 Remco van 't Veer # Copyright =C2=A9 2022 Artyom V. Poptsov # Copyright =C2=A9 2022 John Kehayias +# Copyright =C2=A9 2022 Hilton Chain # # This file is part of GNU Guix. # @@ -1040,6 +1041,7 @@ dist_patch_DATA =3D \ %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 buffer= s") diff --git a/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error= .patch b/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.pat= ch 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' ha= sn't changed" +- (file-name-nondirectory ifile) a= ction) ++ (if is-exporter "exporting" "wea= ving") ++ (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 +--=20 +2.37.2 + base-commit: de2f419618b9929cf65b477568f21bc77e218b70 --=20 2.37.2