From patchwork Wed Apr 9 19:00:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41512 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 8221327BC4C; Wed, 9 Apr 2025 20:02:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 1F09227BC49 for ; Wed, 9 Apr 2025 20:02:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2agq-0003k9-02; Wed, 09 Apr 2025 15:02:24 -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 1u2age-0003jC-R4 for guix-patches@gnu.org; Wed, 09 Apr 2025 15:02:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2agd-0007NZ-Ne for guix-patches@gnu.org; Wed, 09 Apr 2025 15:02:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=GP/NhmyDWbGwAYcgPSSkBDExza3Zk46JCZ7JHG0Yc2g=; b=VxcDrfQWNFCsX3dbZCH/IgYHd9YWORx6iQ4pzgZQRyGMGEaEOtLy7SRPMLB37oH4+bjNQpVqSseEbEZF09N5WYwo2ckWLutYuepBte6P1h2Us0YVkRy4v3a3/sI0SYkbQZtPKvdBX5sxpmM+u2qPEpXb2KBaitrBROquJhUtfR98kl6b/beLGRlObrLGtF0cUY/MNT4Bpf+Za7VXPGeEPRwvfN7YHZ7PpuVLYNjB/7liMdpQL97+uqTnkuvpWBs4CT9EbRmoJnBcJxsLvzgc/eHYky65pVRjHbOmi2SJnpFouUT5cOrIy51ue6UxV18vQOuS4nMjbdu8Oo2U+E/UDA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2agT-0001Y7-Sn; Wed, 09 Apr 2025 15:02:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77681] [PATCH 1/6] gnu: emacs-next: Update to 31.0.50-1.9663c95. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, csantosb@inventati.org, divya@subvertising.org, hako@ultrarare.space, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 09 Apr 2025 19:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77681 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77681@debbugs.gnu.org Cc: Morgan Smith , Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 77681-submit@debbugs.gnu.org id=B77681.17442252965847 (code B ref 77681); Wed, 09 Apr 2025 19:02:01 +0000 Received: (at 77681) by debbugs.gnu.org; 9 Apr 2025 19:01:36 +0000 Received: from localhost ([127.0.0.1]:42075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2ag3-0001WC-KC for submit@debbugs.gnu.org; Wed, 09 Apr 2025 15:01:36 -0400 Received: from mail-dm6nam10olkn20802.outbound.protection.outlook.com ([2a01:111:f403:2c13::802]:5600 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2ag1-0001Vh-Ej for 77681@debbugs.gnu.org; Wed, 09 Apr 2025 15:01:34 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HtfV1hpH9HsWVFvxsqvXhFtU1cRDxzKLOk+mW9Dpjla2dFIic2qdVAWIBjLHZCK5X3QRMFDDsJgX716xBbABcCTogk4WFulZradPlgmwSPVY/2VMN3TD5q5+JIx8WyK/X718LATmZXo9oPk3NRd1FUPDsOFZg/f5h1abre8+0BR1rZb4zXLX2szhgjDghhPcI8ACCrp4BQrKbLv5QYeMd2g017j2ReAyE5XVGRQwZxfOX2My4tYQmjWsuQvtpAND2QTcCiHh3x6c87aE26ZcgX1SAdRu3xUqEivug9AFG4eKC2WbRizfPtPDjwRW4iQqnJFcMfgUqXd60J/Uy5acYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GP/NhmyDWbGwAYcgPSSkBDExza3Zk46JCZ7JHG0Yc2g=; b=KfyRlZNKZ6kRqk+imHEWDPebuCd+sFrMJqz68Z+8Aqu34ygtE8gXMElxvcPfrejNFzzim/XHfzT1JqJ2/rw9CZ7IxjaJ1uXxk84pnnNPGz7rqtgc8JWjKNks7SmGQczpRJ/usSUYhv8UyZK7oHi9NgzhdeLa1+hG5k1Aoi+1UDrwgrcCG9ZbIAzBId7ySTHc0w/pew1oLyPGb3bc0eGo36KknR2GQhVWcqXIfWOGizJgTfsophm/19VjBDjQ3KKPwZXyX6aoxdbF6eQDryPRYINEZ8ruR4W6Dplwd2znrxHoRaLzk2eMGgUmnOgAeSuuqH/i1t8juwx/LhJazrMolw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GP/NhmyDWbGwAYcgPSSkBDExza3Zk46JCZ7JHG0Yc2g=; b=Fv/bLzKk0pZ1IQ/14T4K/9XwUeMEXWklg3fQNpDrbZxBYxpZ5HoeghUUAhOzyzdWPIWsgSJniBmb7lX9tz21KaVVm+drlOVXIJQrE8Byry8wmg6yNVzuaDRm5WTc7KHQsi9FqcUN/GNKqk7a+CC3Mu+fFTzWFrKS9JoCpAGQMqpeg8/hPJfY5PTXdSirK9o76tz1SEl11w5L+G/G06FrA4Oa4hKgaVdzo6F6c6q3IiV/RdYFx2JaJF74cJtQqwPl9hPwdSgZL0if1w9Je/gqiEg+YC8VTDkEDR1Azbsvik9mspP19MPK/fisnlOe7TYi1AY4oxPo4C4kvNhgEzNofg== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by MW5PR84MB1356.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:1c2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.37; Wed, 9 Apr 2025 19:01:25 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8606.033; Wed, 9 Apr 2025 19:01:25 +0000 From: Morgan Smith Date: Wed, 9 Apr 2025 15:00:59 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: X-ClientProxiedBy: YQZPR01CA0171.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:8b::29) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|MW5PR84MB1356:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b2f1170-71c9-4fd4-12b0-08dd7798ecaa X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|5072599009|8060799006|19110799003|7092599003|15080799006|10035399004|440099028|3412199025|12071999003|41001999003|21061999003|1710799026; X-Microsoft-Antispam-Message-Info: Rp+aMn/5InpHqoDurZ3iXZ79E0o2dVlWaon5i+/Pt3dwmelcD9nflUy6FIBGcZA5ms74ItBP0CnPOdfgIbaQ63hCBdAf+M7RC4hR4KIhRD4mGLdjbrFmLQ+xNjht8fJ0x1sdinWTgkBOm/81qlJydR2/hBjAt2gpxNa/qm0Dify8k6LAHdD9scPre8mX1kmXKTOkpRy1koCpB721VQn0iOQwZAYZrAkiSf1aH7DybjvBZZH8lqcPq79nO9lrGhvxccW8iOxBPNFO8V4JUGvZargORbmeO7md2B69NPaS26Mj+npdmNMYVyKObo8ZFq9QMuyRAsqjLhN+IDWFwAMuzzaxyRJw2S7Wy+VmAVPXM+5cLuVOJy2nue1OAUuJUeiGNQSUO6W6CLFAR4mshyrQH2WblrH60dU02jUpxvlni5pwHUBFlbFDF7N81zX8bR2AO1T28VCZw0S4DKMa18OlXHTC8PmT1RxG7jslXOMlcPGea7pYcuYmDQtm8naIjrXN6Bj634RLHHxsIXHsLe2f+GxPFhQMg42Ybswdqlj2i7d7kYbdKEQu2dE70c7TBB/FJNfQHUkyvu1gLeEfz79wyuPz6vKgh1J0kQV5MSNjlgNLWZk81c6npVSe96Lr8grlIw9+vYr+8zczdH6+M2xzPKtCsX4KI3wh9TfONgQu7CUm+B54uyhusKgF7OLphZR4lKnVckCy7s/Oxx7CoIjF+/hs1FAgeW+DLcNQxGdIhUVT99YNtm+CJROKZsleGWyjc+RqyrB7v78tbZ4df4CmD1guwXg8stxU1xTVza6X0CD1wGAUBwf5K1eSDYV2u3er/grtQOhXtJwBW0t9epGpR1ECJvJg0PBbXy28V5MZd0e1FLYF0ITBHYbIMmNAFWgchJ4kjXIYH2HnI6zkiePMlZ/dvjyPuCFqmCeJ980KBwJFXYlI40BG573+74JA0Qub8DQr5BvBEjuK4yTJWeSWiRpPhvPnEaEpiQreqoCsMHz7m8VhLfoeKzhsPGtjNNXgJuejgLn/nsl4yD4A3N6Cv8eo3b3Q8mV+G21U1Lxh5TUIiL4i8K9RrB9DKA1IyGRNsrMqKxmI3x5p/WwbweV35UWNXDm9GZK49WiVDk7v+6FkGte3kUE/vA2Ig2LcyPAT3AjwP5aO2+fRUWeRIWOR2Z4rQE/2o72v0mRAx2XxvBWSGUef4n0/kHgzeyybO1UVbpwagBBKBd9fBg1oFpTKxMYFBxnuYps7hA0dVtmbyYL/Ao1uy4ogfmr8GvBa9u+sql4DE1WUB/IQ2SFImS+otCqopAJKKG1rghDZNvlqR7c= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1hm+8H6eVR0YdRJFdoMmq1gH0nwk7nDO2CbFjUtpqCBDF20OkM4PkfoXHfhOww2gzT9SkNyrJ16Kr8CSRgdB1KWQpQjSUx9fhO0UIazfr+vD/1e+SyRZzIYm5j6Dsfb0KifFxf2RWPNppNU9TeyLut1Qs6Jf3TeywMz2FkPcN2eRaW6jFRdxE+8Sre8DdEFXZd/QByg+2GOwJSWVH92osZ4sLAFoB0ASYoViuBLlZ2WNcx16uwLF7Kqc9OnfNbGBFuI+bYhALmBLaU4UbOKrGHAl2SLX+P+5VS3AFx4G6657XYzOlec+4OxCOau4WVyGTQcFDyjs2BOBC2nEkHVS1Fi3GZ9VPjd4kkb+5Kt5ZGfOJbLhwv7XvE/wsLWj9OZnPi2xovbPKYU35fPNFIwLHuagclgIq8fOK5bKurLIvvw5c1oNqg6EcitPcW9x8sLSZeCaHDbVFrPZmw/3dgZCnoV1RfThu6jjb1yZBIRuKeav7yu8LWAyO+8a7mqbHhVxgWE0U6f89dCQCStj4FlfzhoWTSnbv0yleQQmVYBjdIYeIXrJBOq5QesMGvEvmQv7K3CyyzNeUMcPRt/hcVVoQll61jDPNOuaHPWG9ScL6Y5xJkzyYbFwTi35pXEC3KRy9wBsNAtKxGGUvyMlBXr0yfxPodBzleplvvfoIkQqothab6hDOQiQDfwwfCypHjcLnPOyjohyMU7oG194yDuHjVh/G4jKu9dZhRmME7b6GcZCDbwCIOOrbFb7lARmIAuldtGXOwxZjuLgfC/rqV07n/F8rnsI2vnS8+tOiqpefM9PnhQ37YUXZvw8EdZW5zLCl5V2lFnSGk2ciR2ynzJtRAHspOQgTffuthCzzz8eiJm/rPoLbFSfifV/3aOa4/OLApzqmKi3NkfS8EQ2bBhfua8u0WXQ8jq7Dke1g1SbRojuMqafFqEZtMZ3tdiK7J+8O3BMIx7sEzFxb1iwTXR3gkTxMOzySqsX6NdN4pfOlWMrALLJIe+XTYsW0QOrc5gvOJt21Enq9CBDaeMFPSdIWYYr2Qc7Mp0VCUkFzTLcSO/OERoYaEuO5pSuoDeXW9UJyqwkhVmzw9hMq6xMEwaGlxV+ovXK/xk8B9uSh0dhAQoYcccjZnbMLFvDVomAMb/m2WqTs2t8J0jB/NoXRJHjytq13SqUOwgIPa5tpP+DefzM487wDF0fLOk9HN71WkZsvjye4j54seCarEcJwwtY9NvvzZAawhvyCi5vAW4a20LZB9uADLJrM7RAsMSQeLmdxyqmYUdUte5y8hlrsj7cjYY7qDX0ZdRZSCwfx4gYAGbx38qBxZdiJLkFKz/kJ80F X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b2f1170-71c9-4fd4-12b0-08dd7798ecaa X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2025 19:01:24.9792 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR84MB1356 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-next): Update to 31.0.50-1.9663c95. * gnu/packages/patches/emacs-next-disable-jit-compilation.patch: New file. * gnu/local.mk: Register new patch. Change-Id: I2b13ce4c2ef030d8d7911ca524576d5b81e5db73 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 8 ++++---- .../emacs-next-disable-jit-compilation.patch | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/emacs-next-disable-jit-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2b08ce42f2..c0b9a76cd2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1233,6 +1233,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ %D%/packages/patches/emacs-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-native-comp-pin-packages.patch \ + %D%/packages/patches/emacs-next-disable-jit-compilation.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7a57aad15d..9a020d89aa 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -573,8 +573,8 @@ (define-public emacs-wide-int #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal - (let ((commit "60232a30e360c00fb303cb033d4aec15a9e41342") - (revision "0")) + (let ((commit "9663c959c73d6cca0c56f833d80ff1d9e9708b70") + (revision "1")) (package (inherit emacs-minimal) (name "emacs-next-minimal") @@ -587,9 +587,9 @@ (define-public emacs-next-minimal (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1n1i20j92a8sqv224yzvyzk804h9x0lgyp3jlny3b6g08ka91034")) + (base32 "1a03j9zdn1fl181xcqsw4vg3v8a3sbv1r3d49ld6ysldvfkwiz39")) (patches - (search-patches "emacs-disable-jit-compilation.patch" + (search-patches "emacs-next-disable-jit-compilation.patch" "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" diff --git a/gnu/packages/patches/emacs-next-disable-jit-compilation.patch b/gnu/packages/patches/emacs-next-disable-jit-compilation.patch new file mode 100644 index 0000000000..0e89e8f506 --- /dev/null +++ b/gnu/packages/patches/emacs-next-disable-jit-compilation.patch @@ -0,0 +1,19 @@ +Index: emacs-29.2/src/comp.c +=================================================================== +--- emacs-29.2.orig/src/comp.c ++++ emacs-29.2/src/comp.c +@@ -5648,8 +5648,12 @@ For internal use. */); + doc: /* If non-nil, compile loaded .elc files asynchronously. + + After compilation, each function definition is updated to use the +-natively compiled one. */); +- native_comp_jit_compilation = true; ++natively compiled one. This variable is enabled by default upstream, ++but disabled in Guix to better make use of precompiled packages. ++Notably, Guix removes the hashes that prevent inadvertent shadowing ++frm the file names of compiled libraries in order to facilitate grafts. ++Enable at your own risk! */); ++ native_comp_jit_compilation = false; + + DEFSYM (Qnative_comp_speed, "native-comp-speed"); + DEFSYM (Qnative_comp_debug, "native-comp-debug");