unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: John Kehayias via Guix-patches via <guix-patches@gnu.org>
To: 62314@debbugs.gnu.org
Subject: [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native compilation.
Date: Tue, 21 Mar 2023 02:26:44 +0000	[thread overview]
Message-ID: <87a606c00u.fsf@protonmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

Hi Guix,

Here's a patch to fix emacs-buttercup failing with native-comp, i.e. guix build emacs-buttercup --with-input=emacs-minimal=emacs.

Here is the link to the upstream issue: <https://github.com/jorgenschaefer/emacs-buttercup/issues/236>

In short, it should be fixed but the fix used a variable name in current git Emacs which is different in the current release. So this patch adds the older variable name with the same fix.

I checked that it lints and native-comp and regular both build. I'll wait for QA to check for any other breakages. And I welcome any input on the commit message/code comment here.

Thanks!
John

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-buttercup-Fix-build-with-native-compilatio.patch --]
[-- Type: text/x-patch; name=0001-gnu-emacs-buttercup-Fix-build-with-native-compilatio.patch, Size: 1643 bytes --]

From e6a0fda045ef016845c1b247c1b57074702a9b59 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Mon, 20 Mar 2023 22:13:40 -0400
Subject: [PATCH] gnu: emacs-buttercup: Fix build with native compilation.

The spy-on test fails with native compilation, which was fixed in v1.30 but
with a variable name for newer versions than stable Emacs.  Here we add the
same fix but using the current variable name.

* gnu/packages/emacs-xyz.scm (emacs-buttercup)[phases]{fix-spy-on-test}: New
phase.
---
 gnu/packages/emacs-xyz.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0a1846ea4c..74968d421b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -27141,6 +27141,15 @@ (define-public emacs-buttercup
       #:test-command #~(list "make" "test")
       #:phases
       #~(modify-phases %standard-phases
+          (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:
+                ;; <https://github.com/jorgenschaefer/emacs-buttercup/issues/236>
+                (("61880") "61880\n(comp-enable-subr-trampolines nil)\n"))))
           (add-after 'install 'install-bin
             (lambda _
               (install-file "bin/buttercup"
-- 
2.39.2


             reply	other threads:[~2023-03-21  2:27 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-21  2:26 John Kehayias via Guix-patches via [this message]
2023-03-21  9:34 ` [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native compilation Nicolas Goaziou
2023-03-24 19:38   ` John Kehayias via Guix-patches via
2023-03-24  9:17 ` bug#62314: " Nicolas Goaziou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87a606c00u.fsf@protonmail.com \
    --to=guix-patches@gnu.org \
    --cc=62314@debbugs.gnu.org \
    --cc=john.kehayias@protonmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).