From unknown Sun Aug 10 08:58:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native compilation. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 02:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62314@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.167936561830769 (code B ref -1); Tue, 21 Mar 2023 02:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2023 02:26:58 +0000 Received: from localhost ([127.0.0.1]:57243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peRiD-00080B-FD for submit@debbugs.gnu.org; Mon, 20 Mar 2023 22:26:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:41608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peRiC-000804-4v for submit@debbugs.gnu.org; Mon, 20 Mar 2023 22:26:56 -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 1peRiA-0008LJ-Br for guix-patches@gnu.org; Mon, 20 Mar 2023 22:26:54 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peRi8-0005jP-1P for guix-patches@gnu.org; Mon, 20 Mar 2023 22:26:54 -0400 Date: Tue, 21 Mar 2023 02:26:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1679365609; x=1679624809; bh=kA7G+p6ohiZddMmhicQIGdGucSUX1i+382qXJ09/AWI=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=TI2FqkGNTDEJTnWN4/vYOwGmXE+FddCLI4Fl5KMZWm488pW3peSyAlHdyixlseFXg 0P4vys3c175hh+QoljwnUiURNK5BwMAE4/HCm7a+kADBHlv2YsudyVwSaxpf928G4y bIVuJ1KjN34GqHlmEUJroXtgkSUDPGXBw2YWWUZEppfZ6Was9SDoMkoJOYxDzflrcL YyNXf8qbc2eJtpBc00r+TJZtEAE6ZAxqe0XJ4oxOvteckf/9vPj7X+AqikkLRo5UvO mk2V7tKLPcznp791IoKaj3BA41sl5a6arhf9t6xTo/HpymOsb2bNx1xZsqmRMPVlgN CSIWq36XG9/sA== From: John Kehayias Message-ID: <87a606c00u.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_FYLCVccQln4jVtmprokOcunJ7PR2zAPuoGiSdA9o0" Received-SPF: pass client-ip=185.70.43.22; envelope-from=john.kehayias@protonmail.com; helo=mail-4322.protonmail.ch 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, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This is a multi-part message in MIME format. --b1_FYLCVccQln4jVtmprokOcunJ7PR2zAPuoGiSdA9o0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Guix, Here's a patch to fix emacs-buttercup failing with native-comp, i.e. guix b= uild emacs-buttercup --with-input=3Demacs-minimal=3Demacs. Here is the link to the upstream issue: In short, it should be fixed but the fix used a variable name in current gi= t Emacs which is different in the current release. So this patch adds the o= lder variable name with the same fix. I checked that it lints and native-comp and regular both build. I'll wait f= or QA to check for any other breakages. And I welcome any input on the comm= it message/code comment here. Thanks! John --b1_FYLCVccQln4jVtmprokOcunJ7PR2zAPuoGiSdA9o0 Content-Type: text/x-patch; name=0001-gnu-emacs-buttercup-Fix-build-with-native-compilatio.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-emacs-buttercup-Fix-build-with-native-compilatio.patch RnJvbSBlNmEwZmRhMDQ1ZWYwMTY4NDVjMWIyNDdjMWI1NzA3NDcwMmE5YjU5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogSm9obiBLZWhheWlhcyA8am9obi5rZWhheWlhc0Bwcm90b25t YWlsLmNvbT4NCkRhdGU6IE1vbiwgMjAgTWFyIDIwMjMgMjI6MTM6NDAgLTA0MDANClN1YmplY3Q6 IFtQQVRDSF0gZ251OiBlbWFjcy1idXR0ZXJjdXA6IEZpeCBidWlsZCB3aXRoIG5hdGl2ZSBjb21w aWxhdGlvbi4NCg0KVGhlIHNweS1vbiB0ZXN0IGZhaWxzIHdpdGggbmF0aXZlIGNvbXBpbGF0aW9u LCB3aGljaCB3YXMgZml4ZWQgaW4gdjEuMzAgYnV0DQp3aXRoIGEgdmFyaWFibGUgbmFtZSBmb3Ig bmV3ZXIgdmVyc2lvbnMgdGhhbiBzdGFibGUgRW1hY3MuICBIZXJlIHdlIGFkZCB0aGUNCnNhbWUg Zml4IGJ1dCB1c2luZyB0aGUgY3VycmVudCB2YXJpYWJsZSBuYW1lLg0KDQoqIGdudS9wYWNrYWdl cy9lbWFjcy14eXouc2NtIChlbWFjcy1idXR0ZXJjdXApW3BoYXNlc117Zml4LXNweS1vbi10ZXN0 fTogTmV3DQpwaGFzZS4NCi0tLQ0KIGdudS9wYWNrYWdlcy9lbWFjcy14eXouc2NtIHwgOSArKysr KysrKysNCiAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspDQoNCmRpZmYgLS1naXQgYS9n bnUvcGFja2FnZXMvZW1hY3MteHl6LnNjbSBiL2dudS9wYWNrYWdlcy9lbWFjcy14eXouc2NtDQpp bmRleCAwYTE4NDZlYTRjLi43NDk2OGQ0MjFiIDEwMDY0NA0KLS0tIGEvZ251L3BhY2thZ2VzL2Vt YWNzLXh5ei5zY20NCisrKyBiL2dudS9wYWNrYWdlcy9lbWFjcy14eXouc2NtDQpAQCAtMjcxNDEs NiArMjcxNDEsMTUgQEAgKGRlZmluZS1wdWJsaWMgZW1hY3MtYnV0dGVyY3VwDQogICAgICAgIzp0 ZXN0LWNvbW1hbmQgI34obGlzdCAibWFrZSIgInRlc3QiKQ0KICAgICAgICM6cGhhc2VzDQogICAg ICAgI34obW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzDQorICAgICAgICAgIChhZGQtYWZ0 ZXIgJ3VucGFjayAnZml4LXNweS1vbi10ZXN0DQorICAgICAgICAgICAgKGxhbWJkYSBfDQorICAg ICAgICAgICAgICAoc3Vic3RpdHV0ZSogImJ1dHRlcmN1cC5lbCINCisgICAgICAgICAgICAgICAg OzsgVGhlIHNweS1vbiB0ZXN0IGZhaWxzIHdpdGggbmF0aXZlIGNvbXBpbGF0aW9uLCB3aGljaCB3 YXMNCisgICAgICAgICAgICAgICAgOzsgZml4ZWQgaW4gdjEuMzAgYnV0IHdpdGggYSB2YXJpYWJs ZSBuYW1lIGZvciBFbWFjcyBuZXdlcg0KKyAgICAgICAgICAgICAgICA7OyB0aGFuIDI4LjIuICBB ZGQgaW4gdGhlIHNhbWUgZml4IHdpdGggdGhlIGN1cnJlbnQgdmFyaWFibGUNCisgICAgICAgICAg ICAgICAgOzsgbmFtZS4gIFVwc3RyZWFtIGJ1ZyBhbmQgZml4Og0KKyAgICAgICAgICAgICAgICA7 OyA8aHR0cHM6Ly9naXRodWIuY29tL2pvcmdlbnNjaGFlZmVyL2VtYWNzLWJ1dHRlcmN1cC9pc3N1 ZXMvMjM2Pg0KKyAgICAgICAgICAgICAgICAoKCI2MTg4MCIpICI2MTg4MFxuKGNvbXAtZW5hYmxl LXN1YnItdHJhbXBvbGluZXMgbmlsKVxuIikpKSkNCiAgICAgICAgICAgKGFkZC1hZnRlciAnaW5z dGFsbCAnaW5zdGFsbC1iaW4NCiAgICAgICAgICAgICAobGFtYmRhIF8NCiAgICAgICAgICAgICAg IChpbnN0YWxsLWZpbGUgImJpbi9idXR0ZXJjdXAiDQotLSANCjIuMzkuMg0KDQo= --b1_FYLCVccQln4jVtmprokOcunJ7PR2zAPuoGiSdA9o0-- From unknown Sun Aug 10 08:58:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native compilation. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 09:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62314@debbugs.gnu.org Cc: john.kehayias@protonmail.com X-Debbugs-Original-To: John Kehayias via Guix-patches via X-Debbugs-Original-Cc: John Kehayias , 62314@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16793912979708 (code B ref -1); Tue, 21 Mar 2023 09:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2023 09:34:57 +0000 Received: from localhost ([127.0.0.1]:57677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peYOO-0002WV-TX for submit@debbugs.gnu.org; Tue, 21 Mar 2023 05:34:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:56590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peYON-0002WO-Qh for submit@debbugs.gnu.org; Tue, 21 Mar 2023 05:34:56 -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 1peYON-00053Z-Fz for guix-patches@gnu.org; Tue, 21 Mar 2023 05:34:55 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peYOL-0004g3-IL for guix-patches@gnu.org; Tue, 21 Mar 2023 05:34:55 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id E7157FF80C; Tue, 21 Mar 2023 09:34:47 +0000 (UTC) From: Nicolas Goaziou References: <87a606c00u.fsf@protonmail.com> Date: Tue, 21 Mar 2023 10:34:47 +0100 In-Reply-To: <87a606c00u.fsf@protonmail.com> (John Kehayias via Guix-patches via's message of "Tue, 21 Mar 2023 02:26:44 +0000") Message-ID: <87355y30so.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=217.70.183.199; envelope-from=mail@nicolasgoaziou.fr; helo=relay9-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Hello, John Kehayias via Guix-patches via writes: > Subject: [PATCH] gnu: emacs-buttercup: Fix build with native > compilation. Thank you. > + (add-after 'unpack 'fix-spy-on-test > + (lambda _ > + (substitute* "buttercup.el" > + ;; The spy-on test fails with native compilation, which was > + ;; fixed in v1.30 but with a variable name for Emacs newer > + ;; than 28.2. Add in the same fix with the current variable > + ;; name. Upstream bug and fix: > + ;; > + (("61880") "61880\n(comp-enable-subr-trampolines nil)\n")))) Nitpick: I'm surprised by the choice of your anchor: 61880 is at the end of a comment. Wouldn't (("\\(native-comp-enable-subr-trampolines nil\\)" all) (string-append all "\n(comp-enable-subr-trampolines nil)")) be more explicit? Regards, -- Nicolas Goaziou From unknown Sun Aug 10 08:58:55 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: John Kehayias Subject: bug#62314: closed (Re: [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native compilation.) Message-ID: References: <878rfmzexl.fsf@nicolasgoaziou.fr> <87a606c00u.fsf@protonmail.com> X-Gnu-PR-Message: they-closed 62314 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 62314@debbugs.gnu.org Date: Fri, 24 Mar 2023 09:18:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1679649483-1010-1" This is a multi-part message in MIME format... ------------=_1679649483-1010-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #62314: [PATCH] gnu: emacs-buttercup: Fix build with native compilation. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 62314@debbugs.gnu.org. --=20 62314: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D62314 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1679649483-1010-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 62314-done) by debbugs.gnu.org; 24 Mar 2023 09:17:43 +0000 Received: from localhost ([127.0.0.1]:39832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfdYM-0000FT-Kl for submit@debbugs.gnu.org; Fri, 24 Mar 2023 05:17:43 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:46675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfdYK-0000Ew-D9 for 62314-done@debbugs.gnu.org; Fri, 24 Mar 2023 05:17:41 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 766FA1BF20E for <62314-done@debbugs.gnu.org>; Fri, 24 Mar 2023 09:17:27 +0000 (UTC) From: Nicolas Goaziou To: 62314-done@debbugs.gnu.org Subject: Re: [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native compilation. In-Reply-To: <87a606c00u.fsf@protonmail.com> (John Kehayias via Guix-patches via's message of "Tue, 21 Mar 2023 02:26:44 +0000") References: <87a606c00u.fsf@protonmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) Date: Fri, 24 Mar 2023 10:17:26 +0100 Message-ID: <878rfmzexl.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62314-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, John Kehayias via Guix-patches via writes: > Here's a patch to fix emacs-buttercup failing with native-comp, i.e. guix build emacs-buttercup --with-input=emacs-minimal=emacs. Applied, with my suggested change. Thanks. Regards, -- Nicolas Goaziou ------------=_1679649483-1010-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Mar 2023 02:26:58 +0000 Received: from localhost ([127.0.0.1]:57243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peRiD-00080B-FD for submit@debbugs.gnu.org; Mon, 20 Mar 2023 22:26:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:41608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peRiC-000804-4v for submit@debbugs.gnu.org; Mon, 20 Mar 2023 22:26:56 -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 1peRiA-0008LJ-Br for guix-patches@gnu.org; Mon, 20 Mar 2023 22:26:54 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peRi8-0005jP-1P for guix-patches@gnu.org; Mon, 20 Mar 2023 22:26:54 -0400 Date: Tue, 21 Mar 2023 02:26:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1679365609; x=1679624809; bh=kA7G+p6ohiZddMmhicQIGdGucSUX1i+382qXJ09/AWI=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=TI2FqkGNTDEJTnWN4/vYOwGmXE+FddCLI4Fl5KMZWm488pW3peSyAlHdyixlseFXg 0P4vys3c175hh+QoljwnUiURNK5BwMAE4/HCm7a+kADBHlv2YsudyVwSaxpf928G4y bIVuJ1KjN34GqHlmEUJroXtgkSUDPGXBw2YWWUZEppfZ6Was9SDoMkoJOYxDzflrcL YyNXf8qbc2eJtpBc00r+TJZtEAE6ZAxqe0XJ4oxOvteckf/9vPj7X+AqikkLRo5UvO mk2V7tKLPcznp791IoKaj3BA41sl5a6arhf9t6xTo/HpymOsb2bNx1xZsqmRMPVlgN CSIWq36XG9/sA== To: Guix-patches From: John Kehayias Subject: [PATCH] gnu: emacs-buttercup: Fix build with native compilation. Message-ID: <87a606c00u.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_FYLCVccQln4jVtmprokOcunJ7PR2zAPuoGiSdA9o0" Received-SPF: pass client-ip=185.70.43.22; envelope-from=john.kehayias@protonmail.com; helo=mail-4322.protonmail.ch 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, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This is a multi-part message in MIME format. --b1_FYLCVccQln4jVtmprokOcunJ7PR2zAPuoGiSdA9o0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Guix, Here's a patch to fix emacs-buttercup failing with native-comp, i.e. guix b= uild emacs-buttercup --with-input=3Demacs-minimal=3Demacs. Here is the link to the upstream issue: In short, it should be fixed but the fix used a variable name in current gi= t Emacs which is different in the current release. So this patch adds the o= lder variable name with the same fix. I checked that it lints and native-comp and regular both build. I'll wait f= or QA to check for any other breakages. And I welcome any input on the comm= it message/code comment here. Thanks! John --b1_FYLCVccQln4jVtmprokOcunJ7PR2zAPuoGiSdA9o0 Content-Type: text/x-patch; name=0001-gnu-emacs-buttercup-Fix-build-with-native-compilatio.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-emacs-buttercup-Fix-build-with-native-compilatio.patch RnJvbSBlNmEwZmRhMDQ1ZWYwMTY4NDVjMWIyNDdjMWI1NzA3NDcwMmE5YjU5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogSm9obiBLZWhheWlhcyA8am9obi5rZWhheWlhc0Bwcm90b25t YWlsLmNvbT4NCkRhdGU6IE1vbiwgMjAgTWFyIDIwMjMgMjI6MTM6NDAgLTA0MDANClN1YmplY3Q6 IFtQQVRDSF0gZ251OiBlbWFjcy1idXR0ZXJjdXA6IEZpeCBidWlsZCB3aXRoIG5hdGl2ZSBjb21w aWxhdGlvbi4NCg0KVGhlIHNweS1vbiB0ZXN0IGZhaWxzIHdpdGggbmF0aXZlIGNvbXBpbGF0aW9u LCB3aGljaCB3YXMgZml4ZWQgaW4gdjEuMzAgYnV0DQp3aXRoIGEgdmFyaWFibGUgbmFtZSBmb3Ig bmV3ZXIgdmVyc2lvbnMgdGhhbiBzdGFibGUgRW1hY3MuICBIZXJlIHdlIGFkZCB0aGUNCnNhbWUg Zml4IGJ1dCB1c2luZyB0aGUgY3VycmVudCB2YXJpYWJsZSBuYW1lLg0KDQoqIGdudS9wYWNrYWdl cy9lbWFjcy14eXouc2NtIChlbWFjcy1idXR0ZXJjdXApW3BoYXNlc117Zml4LXNweS1vbi10ZXN0 fTogTmV3DQpwaGFzZS4NCi0tLQ0KIGdudS9wYWNrYWdlcy9lbWFjcy14eXouc2NtIHwgOSArKysr KysrKysNCiAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspDQoNCmRpZmYgLS1naXQgYS9n bnUvcGFja2FnZXMvZW1hY3MteHl6LnNjbSBiL2dudS9wYWNrYWdlcy9lbWFjcy14eXouc2NtDQpp bmRleCAwYTE4NDZlYTRjLi43NDk2OGQ0MjFiIDEwMDY0NA0KLS0tIGEvZ251L3BhY2thZ2VzL2Vt YWNzLXh5ei5zY20NCisrKyBiL2dudS9wYWNrYWdlcy9lbWFjcy14eXouc2NtDQpAQCAtMjcxNDEs NiArMjcxNDEsMTUgQEAgKGRlZmluZS1wdWJsaWMgZW1hY3MtYnV0dGVyY3VwDQogICAgICAgIzp0 ZXN0LWNvbW1hbmQgI34obGlzdCAibWFrZSIgInRlc3QiKQ0KICAgICAgICM6cGhhc2VzDQogICAg ICAgI34obW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzDQorICAgICAgICAgIChhZGQtYWZ0 ZXIgJ3VucGFjayAnZml4LXNweS1vbi10ZXN0DQorICAgICAgICAgICAgKGxhbWJkYSBfDQorICAg ICAgICAgICAgICAoc3Vic3RpdHV0ZSogImJ1dHRlcmN1cC5lbCINCisgICAgICAgICAgICAgICAg OzsgVGhlIHNweS1vbiB0ZXN0IGZhaWxzIHdpdGggbmF0aXZlIGNvbXBpbGF0aW9uLCB3aGljaCB3 YXMNCisgICAgICAgICAgICAgICAgOzsgZml4ZWQgaW4gdjEuMzAgYnV0IHdpdGggYSB2YXJpYWJs ZSBuYW1lIGZvciBFbWFjcyBuZXdlcg0KKyAgICAgICAgICAgICAgICA7OyB0aGFuIDI4LjIuICBB ZGQgaW4gdGhlIHNhbWUgZml4IHdpdGggdGhlIGN1cnJlbnQgdmFyaWFibGUNCisgICAgICAgICAg ICAgICAgOzsgbmFtZS4gIFVwc3RyZWFtIGJ1ZyBhbmQgZml4Og0KKyAgICAgICAgICAgICAgICA7 OyA8aHR0cHM6Ly9naXRodWIuY29tL2pvcmdlbnNjaGFlZmVyL2VtYWNzLWJ1dHRlcmN1cC9pc3N1 ZXMvMjM2Pg0KKyAgICAgICAgICAgICAgICAoKCI2MTg4MCIpICI2MTg4MFxuKGNvbXAtZW5hYmxl LXN1YnItdHJhbXBvbGluZXMgbmlsKVxuIikpKSkNCiAgICAgICAgICAgKGFkZC1hZnRlciAnaW5z dGFsbCAnaW5zdGFsbC1iaW4NCiAgICAgICAgICAgICAobGFtYmRhIF8NCiAgICAgICAgICAgICAg IChpbnN0YWxsLWZpbGUgImJpbi9idXR0ZXJjdXAiDQotLSANCjIuMzkuMg0KDQo= --b1_FYLCVccQln4jVtmprokOcunJ7PR2zAPuoGiSdA9o0-- ------------=_1679649483-1010-1-- From unknown Sun Aug 10 08:58:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native compilation. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Mar 2023 19:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 62314@debbugs.gnu.org X-Debbugs-Original-Cc: 62314@debbugs.gnu.org, John Kehayias via Guix-patches via Received: via spool by 62314-submit@debbugs.gnu.org id=B62314.167968673512556 (code B ref 62314); Fri, 24 Mar 2023 19:39:01 +0000 Received: (at 62314) by debbugs.gnu.org; 24 Mar 2023 19:38:55 +0000 Received: from localhost ([127.0.0.1]:41401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfnFX-0003GR-8M for submit@debbugs.gnu.org; Fri, 24 Mar 2023 15:38:55 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:44973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfnFV-0003GE-CE for 62314@debbugs.gnu.org; Fri, 24 Mar 2023 15:38:54 -0400 Date: Fri, 24 Mar 2023 19:38:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1679686726; x=1679945926; bh=9xVl7GoIP1fXZ7mz7+y9yQrwaCaxnuWrTF/yaqC3Gg8=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=KDPCc0s58Yol2MomV5wtQ/TmuEEh9bXvgjyABvdA00iflNeXFo3HoMA+e/E2l2eBa FE15Ztp5BWaLjcn8GmeQJNmrMaJgzfacdDbb1W7xyFkCuWqK1WRMrz8RCTd+/QzGbf q0QT25cdoT5iqYynDa9XSKHajeQ3BHlvPfZrQUuDzOIN74jsZPstWdTnyzQVWPki1q Dr6C77314XqI6pXWa0y3xBYShsWPZdVhWt4eXgHhmbvN4WS1yyekfrTeppAZEPXWyq gf8BOPVJOTWW/Vo4zzfTEknEyF0cx1Ti58lp0NKuRfOH6Vtl3j+R9bbTl3grGQijJr J1kYlL/UDBDJQ== From: John Kehayias Message-ID: <87355uaqip.fsf@protonmail.com> In-Reply-To: <87355y30so.fsf@nicolasgoaziou.fr> References: <87a606c00u.fsf@protonmail.com> <87355y30so.fsf@nicolasgoaziou.fr> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Tue, Mar 21, 2023 at 10:34 AM, Nicolas Goaziou wrote: > Hello, > > John Kehayias via Guix-patches via writes: > >> Subject: [PATCH] gnu: emacs-buttercup: Fix build with native >> compilation. > > Thank you. > >> + (add-after 'unpack 'fix-spy-on-test >> + (lambda _ >> + (substitute* "buttercup.el" >> + ;; The spy-on test fails with native compilation, which= was >> + ;; fixed in v1.30 but with a variable name for Emacs ne= wer >> + ;; than 28.2. Add in the same fix with the current var= iable >> + ;; name. Upstream bug and fix: >> + ;; >> + (("61880") "61880\n(comp-enable-subr-trampolines nil)\n= ")))) > > Nitpick: I'm surprised by the choice of your anchor: 61880 is at the end > of a comment. Wouldn't > > (("\\(native-comp-enable-subr-trampolines nil\\)" all) > (string-append all "\n(comp-enable-subr-trampolines nil)")) > > be more explicit? TIL what the second part of the first form for substitute is...thanks for t= hat! Yes, that is better and something I will use in the future. Thanks als= o for pushing! John