From patchwork Wed Apr 9 21:52:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41522 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 7906527BC4C; Wed, 9 Apr 2025 22:55:43 +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 3868A27BC49 for ; Wed, 9 Apr 2025 22:55:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2dNx-0006V2-6F; Wed, 09 Apr 2025 17:55: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 1u2dNw-0006To-8L for guix-patches@gnu.org; Wed, 09 Apr 2025 17:55:04 -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 1u2dNv-0003uq-Uu for guix-patches@gnu.org; Wed, 09 Apr 2025 17:55:03 -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:Date:From:To:In-Reply-To:References:Subject; bh=ZB/ci9src+PDMUC/+D1RgnmXnDFXvIMOHtliYUBnswU=; b=C2+3fWrk+ysQFWnxfjl8Tmpak6L1WOMAWnOgao6ZXw8J24GYcfjI01YhACEizAdGtU67tM/t96diO+eSPpxqdg8NWH3V67pWGZJc68332V7WVMUOwydPICGMObwWVoeSrzfa+CHohNzNZIMJEjjn1ZSqFqIkJc8l2t6gaU9faQ0GD+LPqfkK48QumXATeR/MCtbW9yUUdSl8ho5mikrFyhOZnX7ZqfqCM+gV3F9nhqoZMxt5r/969MHDYnKC0//3Tef3HC+XT9EM//JRGFvgZ6jXlzU52zr6uidDUgvlku9i3m44C1P92E5Ccerf7kd+svQHUuvLxkl1MxzBxIMC6Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2dNt-0003E6-PQ; Wed, 09 Apr 2025 17:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77681] [PATCH v2 1/6] gnu: emacs-next: Update to 31.0.50-1.9663c95. References: In-Reply-To: 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 21:55: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.174423565112273 (code B ref 77681); Wed, 09 Apr 2025 21:55:01 +0000 Received: (at 77681) by debbugs.gnu.org; 9 Apr 2025 21:54:11 +0000 Received: from localhost ([127.0.0.1]:42526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2dN5-0003Br-0h for submit@debbugs.gnu.org; Wed, 09 Apr 2025 17:54:11 -0400 Received: from mail-bn8nam11olkn2054.outbound.protection.outlook.com ([40.92.20.54]:21600 helo=NAM11-BN8-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 1u2dN1-0003BG-Q6 for 77681@debbugs.gnu.org; Wed, 09 Apr 2025 17:54:08 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UFlz6WgjUFcyxPDe2sQtnex/ysRvC7T0skImustkxmDfp7taPfm4dyIYN2s01JF65BGKkAOFkAwSsspJKJAJTWDwgVQtft1a6q2AP/c3XHKwDnAdCqOxS3N9fORqfUnzJfRmVO6b0sQiZGWAwdVclElZKPgMyxOLRXBwDRaMB+2whaC8KjvXvwX8hnwbK0LZ3YUMiLORGsIKx395Eghq/oWndqFYVTF8fBp++IglP6Jp3lPBrfoaglWj0vZaMoEs75ywFY6ClsTEKsw8WByCV75euILyK+LCJy0eekDmJS9SouFFoA9+lvBKUAwTkp4zjQ7iCKvX41nIzNwQVnhSyw== 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=ZB/ci9src+PDMUC/+D1RgnmXnDFXvIMOHtliYUBnswU=; b=FvlLKF4cixSh+AR7MX1k1ojOFYOGEekgXaLJp4Od0nMcQrdup6ql8Ao2YgublL506hITc+YAtA0f3ph2MzIorcYvLUkhVUDQfJWnij85mloJuMa0agY5p19w+zMjdNYP2lmuVL/TsZegkr/5+VjJTo29LiWN8vsxRRAuXkrRkrf3pE01AJhbfp0Qg9Q6lldYAWKpe42Bmkxoxoc4YEf+2UzYlJJL/FZ7OjpuZOGDCKvqKgAz/H51PzouqGZXZ1pmMk5a8AAaJtsp6tjnAVfYYAV4GOdRl9FYfnTHrIsal0Dg9kK0I2kl2ZgIbVZetSOkAUzr8qSunAnJSJpM3XJh9A== 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=ZB/ci9src+PDMUC/+D1RgnmXnDFXvIMOHtliYUBnswU=; b=RNd/LwnkN/I0+tKvuDyyitQ45Z820GPX5dDNFT/If8ZIO8+Wnc2RVjeHMtXJ2vWNSrjNTdHEd8DtbFYPplshQ515yOnWaOnLTbg1htNVAy7VvXV5/Z78wzFqjyq3Gb+LireNeYb6tufOa0OWBDL865q/hnDnCUDQycOEbKiK7kN4XtGbQaXiY6eRa8z4/qD9TUSsgfi7yS+t2Sn3ObCuqRan5KMWW+BmRvLiJTWamLjC1/MIT23ZuMa5mnSiQ4i2DRduExqpsipo5WbSF78kuh9fU5YzfzFcmgW0G4l51R3yXBhYzr2wkyc36R9Gf0lUQoiIMK2npH5TUMPGZ+JPzA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SJ0PR84MB1918.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:a03:434::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 9 Apr 2025 21:54:01 +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 21:54:00 +0000 From: Morgan Smith Date: Wed, 9 Apr 2025 17:52:56 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: YT1PR01CA0059.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2e::28) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <0747e038bf7d3a2441ab89d0320506e7c2a27b36.1744235581.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SJ0PR84MB1918:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a33d0c9-4354-4184-898a-08dd77b10944 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|7092599003|19110799003|15080799006|5072599009|8060799006|10035399004|440099028|3412199025|41001999003|21061999003|12071999003|1710799026; X-Microsoft-Antispam-Message-Info: ZUsa753gtnXBix9R+EyQTOv/iPvbbaog4a9hsHkbYIlEXlbNKZZ6m3uxOCzAQs3dIibnTjox2ZUod/xAL0q+vihis+eaY5dm5h0yuIsrMTRPJeGt1I0ej/Em/Xr0CoFuG0CVVJhdPRfsxbNzBa6Ts2Ss9z2W0ywpWetAhc7NvbLJFMSEkLSmrcSS6+YhUStDbAEwMYkwklZdrnThyxGh1GWmTuZGmM4I+ftuarzVp31k4o/HtKF1FiRevthkIW0pbwHfrJF0c70ENYTnoYLUSiQXLW7P06kfhmEX1vJQCdh0l8rfOw4RADwmpXUue8mT78AxU0PQOfDjSySHenZlNKkTtlL6LGWFE80xKpWizHs4Wl5ra9PBhvvIcxvDAqrSjSv53ri+l7dMzOiZb0q9871wi+Y0s4tzxnD6r3Wt2tJ+z+Z17QpiZitYDvXnWEJIGoUhbVGGa716EPORsAehtdk0A5WC0xIqbkGbwNs90bmhvDJDcRkFqYSt9PQyBdPPcZPw3xZ/+Ko7/xMfTt4738CyGgolBE/DF0/GAmnPZOKUmcRJ0Z1BwNjL8ahbH0zV3uWynMlCO5Y2EgnsUYTL9tXsuZ0vfDEVZhCxDShUBxuFAiYkpU9tqaggzPVHGeOwMbZITu9FamjVmAwDGYeuPfVA3/j4Vs7U4obxwZ2NOjq7iEIHWB/D4ys7sUkz2pDvIL23+1FDq3eOtVVq0YxIpdnPYiSeU3T4K0gwkXXHO7RhjkBTRNlNvWXAhUGTY79bgLN3dZxOdrG7sD3z3AkyI/LjRrIRaGDpiNTJkuc2QyZI6HVsfA+YYBFO6ZtxTBs94ahXdfwUtTxlK8dUvjwW6dyYBWZMmbRptcX4nlreQ+vkibxd2bQv652hPDcmRo3+uU6g05cujlvGqKchaRjagL3KDlEjcs0gkDsqTXBUHkdAzfYEVrkYnUEfbxpw8ch7WypsChh2JZURdo5JMYQUL6SHY6pzayuLit8KV/EUnf601VdEQ3uIxzllckepvf+YtZO1zqf9ekaFvR1ttN3dAANFbff/jPqkMrf9tUrhsc1UYO9pU2t/S3hsvd1xSnjmtIVCAc49b6dU0UkGcCorC0rxqvbGgLwU05hg6bR45pVGKwvB8vmPzZ92bME9lH1zwG3/IyFSTEVVf7+VwUamKjXxWJXbY++hzayJ6GVa1fZy5hwuH7atbZQx5INg1R24sNuDmOnbCuSQjbRTfN7zNxpjYdRV1m0vEARDR4n/MRzjbCVpjs3tbg50d+oRMa8fmQGu9NCdsQNf8ZCY6RHNbD+hVWtRO+K+OcVdkpSFwOc= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bB1Iu44dlVCZWE4qW69RzDlBI0ARvgyBDaQwnor7pod2XEcpwfv3+6ii3XzIIvDRJP8PLzYrSgJXrMhMiUpTp54DXgJpKqJXYtKCKzBCRm8S+hfpD8sqyH6yiXqO0jv3m73wf3NBklu58EJdXeuf4iTbyHNBzP95+iGZ94zROq2IpRlmSzJrvdwTyTYU94BcfLx4gNyvpysPHCcAPIBQqCj+M67zbKq5/QYpVfHRZmXYpmnmKRov2Mo+iQe6CnsSXSwpTh202Zx5U3f43mGjpgRcAzdkriPlHsI1KXJju73aPnI9dvFpJrO7mXtLLco71d24eAcJSpJ1nCrgbRwNNLDm3hn8Ub/VdB5F/3GcZk4QFbxLIVmiKt/VwGNyEbE92GbI9D2Bd5fDnV4GpGtteNOAmGIpXPqysSfBqBwZhnULoabtjqKB6G3DYUMKRw3D352NmCu/98KkB/tHrfjdgRZNw5obWiohLfPw9VV31ENjsJo29GMmJ/Kbo3OAqQJvTE12yIVz4aREIjGC1ipdLxgTymsQI10l1MEPQooVINxax8ulufmnkXt3v4Ohpe/8WmYkspjopw68Q2o2HDrS+nJmmqOFifPQwn3F0aSWoN2UiT0ZJ88cS8L/OhdXxS+GkQjdvEkttdvFlz3ziWWXQ9KPMwCevZmGVbq6QaZS4gTgRgzXC7e1KsrYStPWGMUCh6ghKzZwvhjGo2MbKftaWSPLAeyGKsPtrBievk+sgqA0z5s2WwL5+3QT3ukikOyULczHes+/GfXV9VwI60vO4iUL2oixT6or2SH4fKthnFgu94C1wxMIJc9HcN5cm0K/16PTdn+3FRnbYZ9gEjidd0+XoSrmwbYsjW0UO+ERaOSUqAxyA8DxjS1wjR0MdfoxVcc79HnDMoZpKT9dCHgjEGo907ZUIwmNHSGiQeX+NjqWM2ZZ6vq+SQwsNna9SAraN4YwJnHNdMywArJgL3bzD8PlQfWQB4ovx34YteEUloH5kolCDMvn74cDZQcgRGbA4E335YK8gfyvxaOIaFTO67Cd6DwFT94IjTQ7XgFVzYNuSq/9JEkHb2fqKAXBlk1ecCq6rkYVIFwXre4C8MEb7abTbhWCHdKJQEB2hyZSRSp/Tw6vlzqIbFjLlvLcKjmQdW/lg7tl0KfBQ/B+6zT+lyinWVolbpSOTA4rSr/O8HZza6e48p4ZBJHAo2y4EYP4GNqjoxAPRrVBKUUzAlMBH6x55epjJan80JY3yZ14v3IQxSG0fJDSKsfoKi7aVfCiK18dZY4TY5pPEV7/Rz1/JlxOy67Sud2IFiUi8CQ+Xvq0s1zwuaK2odX0tdQ/5cMB X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a33d0c9-4354-4184-898a-08dd77b10944 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2025 21:54:00.8441 (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: SJ0PR84MB1918 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 base-commit: ca30726285b6883a3b1fa89db64177460af69c42 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..0bac7a25fb --- /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 ++from 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");