From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id l9FoJhAWGWTjKwEASxT56A (envelope-from ) for ; Tue, 21 Mar 2023 03:27:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iIxwJRAWGWTP3QAAauVa8A (envelope-from ) for ; Tue, 21 Mar 2023 03:27:28 +0100 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 33B1F3DD49 for ; Tue, 21 Mar 2023 03:27:28 +0100 (CET) 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 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-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 From: John Kehayias via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679365648; a=rsa-sha256; cv=none; b=W6tABbWZHvzuyVH97Eb4dbBK73zEJU4+lDApWpNUT7jBooDJal+xNyt9JztXp9f6k8ThlY tNGFu/w9Dxc9tLqvt7JToJvjp1O2vRYZJ1mm9G8Vz+hjzpcpZih3BwaOqHl7EZyNI2XQFG OMqh3f1QAdUvsYXdAp8s3Z8ii15ZMiHMkpr0u1vBcPep2wcromECPJDSRx1S5W1QPDjsdu UOtWAP8wxWURtqC5zFdiDys00q2MDDzFDnxBRRK+ikw9bqzAXfyxEJgOoIfwWXfKMtw0LH T9Be4V7yY33E5HqFvImlqCIYl78dSvF4QiIwHNoNFyAzZuPYRt0VYQHAlp+Feg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=TI2FqkGN; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679365648; 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:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=kA7G+p6ohiZddMmhicQIGdGucSUX1i+382qXJ09/AWI=; b=n1ZNVQJcXGZES+nARDN6ram5BxoZBJVKqRD6qmIXu52QOzw1bMP1HjzHPMTfbkWTKxb19k F8DgNSVGaDv4QMC91brJfDGEibCgG8znNbI8P4ubgIbMAlrhw6xaETsjdUmkpB8+X6WHy4 wuL+444Dgob8V+8YDTliz7o5QzpjFAfbxxwBEbOqdomtoTey3n2ci8t5CTkrUsaXD0VrpW d2hside2nwz5VD4/GBjTtQjSXmWq+8EKbhk8hCOliN6Q6h5gLXZx1RqzR8QBu8rWKdHMl4 myuSkiCOO0WxyUovTzRmXGn2fyEepG3GSsyAtatBvoFJ6vbUMQFrGpjD0SlEsw== X-Migadu-Spam-Score: -1.35 X-Spam-Score: -1.35 X-Migadu-Queue-Id: 33B1F3DD49 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=TI2FqkGN; 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-Scanner: scn1.migadu.com X-TUID: /i5pGzphVDU8 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--