From patchwork Tue Mar 21 02:26:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 48483 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 11D5116F3E; Tue, 21 Mar 2023 02:27:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 2BF5B16F3D for ; Tue, 21 Mar 2023 02:27:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peRiL-0008MB-0f; Mon, 20 Mar 2023 22:27:05 -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 1peRiJ-0008Lk-4x for guix-patches@gnu.org; Mon, 20 Mar 2023 22:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peRiI-0005lM-PV for guix-patches@gnu.org; Mon, 20 Mar 2023 22:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peRiI-00080Z-5w for guix-patches@gnu.org; Mon, 20 Mar 2023 22:27:02 -0400 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== Message-ID: <87a606c00u.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 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-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: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias 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 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: 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 From e6a0fda045ef016845c1b247c1b57074702a9b59 Mon Sep 17 00:00:00 2001 From: John Kehayias 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: + ;; + (("61880") "61880\n(comp-enable-subr-trampolines nil)\n")))) (add-after 'install 'install-bin (lambda _ (install-file "bin/buttercup" -- 2.39.2