From patchwork Mon Feb 24 19:53:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 39119 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 E534E27BBEA; Mon, 24 Feb 2025 20:06:16 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 DF67D27BBEB for ; Mon, 24 Feb 2025 20:06:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmehs-0006jm-0c; Mon, 24 Feb 2025 15:05:36 -0500 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 1tmehO-0006bn-4O for guix-patches@gnu.org; Mon, 24 Feb 2025 15:05:09 -0500 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 1tmehN-0000VQ-RP for guix-patches@gnu.org; Mon, 24 Feb 2025 15:05:05 -0500 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:Subject; bh=iqKCiVJQqDXYqyixxxFuERBr9UvVHhW7LfoeCV/RzmE=; b=nY+tvdRxd+R5izcBYZVTZlND0YsugkLYz9sJMizpEjAXI/b0GidMQWS1Cdk14uSi4UU9/Rb5GAaUrvZLJAUTefrmi0uzJviU5YvlSSKRqnKANRSw1LYTUenbT1WKTER9pgsKaXPXYiadQx6NDnnMvCaTGIC6OsW/MQXcT7uQQvvbLkvQa2WDv5D10CFHraqQuHr8nojSp+8UKJCMt/YLTF/XY0bt5KUbh+nDyAqgogkTSN4WCsgerTs3K50L9N869XzuGDij6em3PL101diNLXMGguH6ifxPxrxfBhx0BN84RwS7QfQMXePAw4hFAEVyvRqfhUCyWd+jHj50jRtb9Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmehK-0007kb-E9; Mon, 24 Feb 2025 15:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76529] [PATCH] gnu: emacs-next-minimal: Update to 30.1-rc1. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, divya@subvertising.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 20:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76529 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76529@debbugs.gnu.org Cc: Morgan Smith , Andrew Tropin , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by submit@debbugs.gnu.org id=B.174042744129679 (code B ref -1); Mon, 24 Feb 2025 20:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Feb 2025 20:04:01 +0000 Received: from localhost ([127.0.0.1]:42819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmegL-0007iN-3U for submit@debbugs.gnu.org; Mon, 24 Feb 2025 15:04:01 -0500 Received: from lists.gnu.org ([2001:470:142::17]:56924) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tmegI-0007i2-Em for submit@debbugs.gnu.org; Mon, 24 Feb 2025 15:03:59 -0500 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 1tmefQ-0006Gl-6J for guix-patches@gnu.org; Mon, 24 Feb 2025 15:03:10 -0500 Received: from mail-co1nam11olkn2081d.outbound.protection.outlook.com ([2a01:111:f403:2c16::81d] helo=NAM11-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmefO-0008HU-7r for guix-patches@gnu.org; Mon, 24 Feb 2025 15:03:03 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pvPgZGjk9gXXp4jSa3WAFojGu2Uv1Q/XNmjYSuK7QxxV4bon85OtQ56c7KRbx/V116Jbqqq0eFfJ/T6/wd8Mt0s2xl5vkAowBNzmrA3L5il6ZAxHmPaFiP3mHv/4c+rIq3ru3y//WLGbJbavduF/ED69eJZIY74kFCdU1FZ+Pa4srX3TPW/yRaMxNJatB6eYfmtKNJFEFhbHaxfMCu/SwxAqic7o1AtUfDnQRX0XUtockvuUpekg8bRTXOlkWaEuyG8lAbM3mxwEvBnsaYxeMRS5bM01Dl5s9KMWMuRd9P3qdRZHiu8hwc3VGB/EuwEpQq1Wj2eWy9TlbeM8QpQGqw== 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=iqKCiVJQqDXYqyixxxFuERBr9UvVHhW7LfoeCV/RzmE=; b=BhUjkjqAmBOldDn1dGm04/juSQogm7wqf7gBams9pKenEh7qqG/i6SewDfUVb+OqBF/etRq1lw00tB304kWydF5thLMCRIWmU0YNEKq4mcJ4I/iHH8piQ8qM8Ut8j39ZH9U82pGDVEfvBcqxr3UijSfbtvzySwdAzHRWkC5UY6CM24dQ/1zNCSTrHKCjQXQW3BCymSyvFK/ZWkbZVWo0GcaGoDJ+YylNO+ZZp7nSYzqkAySgEz7/4qOtJ7CkABNF4d3tItiaE5c0fu9WDZpynfRx/fO1TKFVAcHDsD6LBLTjxhot5YwxaPt3ydBGsAGwH97Qjxhw2F0CKEbJnIS8AQ== 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=iqKCiVJQqDXYqyixxxFuERBr9UvVHhW7LfoeCV/RzmE=; b=RGs2EXYT1TJgxsv/PTCQR4DrHW3GuUaN+wvt2E5pdPSd/CPxmz+T3KBWwBAgefmui7gZf++iSVz2QCmWm0K/41iJ3zlwW+o9AHBxBtlqYunjfSr54Yms9FZiR1wVTI0sCFFdh7Bs/OLfYqOkbXejCW4XFSRqtgKNJV9HECuZK/2astlXbb6gTCHJsHauOLqUaURUBtnwwHL00VYi4bri1kObgrusTH4cATIJjxuB11j1oa7RJHBCHUjf8oNmfZ3RCSMxq1RhcDyjqOF5lpvantO41SQ0G/F087dVTT7J1l3EGQeGMe2HfPmb1/sgRVeMEz+F0TOoB/JLdHG1ZlsZ1g== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by DM3PR84MB3642.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:0:45::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.21; Mon, 24 Feb 2025 19:57:57 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%4]) with mapi id 15.20.8466.016; Mon, 24 Feb 2025 19:57:56 +0000 From: Morgan Smith Date: Mon, 24 Feb 2025 14:53:58 -0500 Message-ID: X-Mailer: git-send-email 2.48.1 X-ClientProxiedBy: YQZPR01CA0188.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:8b::28) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <712c262c7b73e24e7e0de7b621f968062403e01b.1740426837.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|DM3PR84MB3642:EE_ X-MS-Office365-Filtering-Correlation-Id: 10837970-d9d4-41d9-78f8-08dd550d8824 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|5072599009|19110799003|15080799006|7092599003|8060799006|3412199025|440099028|10035399004|12071999003|21061999003|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: vitAYIPJIIkU9cEFC103SqtJDgqnnrO3iHWm6Edq61X689S0aBCIjCrC16i+CdWdWaxngb07ncmyPid2ClmJDqvIc60skmbzkgPJpaOC3rmqnKI1LqDaaNFYipT6xw9GN6vxn/bBeTIeCblgXedPZNF/9NIjw1DoKfGKFDAD78G+DzgnmJZWeSCCyHSiQHdABcurW2Hcc4UsKl0oOo9VVAuYlicWHjd/Li1iKMs2ZuQXCLNwhKMtcIJNxoTzRCkuS/GZMtF7q/9gfjg+Lh0QPyI3Fe0Mjqm2Mkhe6yrU2VPxhl0g15RbXxvJ/SiWiTQSipVu0ch54rsXo/dHsLWLigUGeEFvI7/6bzDw3dIQqCvSDhJ7QvTrxGh0Cu1g4b+ghY00hsD9gpwBDAGZ4lRzXCnxy9LbVaFMlMoTsj/fcoR0CQfJi5AFNJZaHtPZE+wGyLvzkcpEA9hFQqxRQJ5d46w+koZJ3GUL8ccQnXPV9L9vzx+rsaPfsqGgAVWg4wRohKyC1vvXEexIJPARyWoondteUvKBJRMc+dqP8+nTdU3z3VChdCH0cEvwngoVe+RyE7a2kqqOLY0qGtXLLtyj5YFAr/ZYq7W9xbRrczKxICBvgVBgfrESwkIX+/UJTiWKF0iQKBMMYWVn3uBe7owaybgwA+p5NVAMlGbf5iq+Efw9nimPCxQ+g72JUjTd8CKrCq5qLCtUxpY9RERHZrdDOmIsRNjmbXa61AasmdaGmVlKZStIikSU6ZgwLF9flVJmMKemAWv71bJUdgSu0HB41rIZPJa8rVU6YvZCFzGXaClmsRCe2puOQuRYrhUODOQfKMcgHd/A81wOzmrMW15ks0MKRqFns5afB2y1fEKJOHvmKeYYZIm9ldCrhjMOltu1FgNO6BaxLky2PHv+M6+aqntYWMzdXL5m2/At2z/BusstWDZqOz1+MaLEaznKhAvwNZSB7OixA4+DPF/3nRfd1QU+JS5gn3S24BS7X2DdEFlT7WOIPBCaQMk71nrxzGklNrOuCCRC66CTO1rUyEKcEPehPCpheRlYg23mATIRvUDOTUEl+zDCQNgt5e9xGH5ysaHSlO5bmKA7h0tJgXYMXH3yQ+Ajs5GgotzAHK9f+7Izxg4L2i6CVOoE9KD1ylDsnD3OYp/gudRxSc1oiWU1olNg7D5QrEVnIFJhtO0wOuaIJhCKp/d+0xgM3qM/TaO/y88s97rZvzaSc/NugMV0wy8zgNxKpr0JUW0DTzmfHO/HpQXVdXmTNEtCMlO7D1Do X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y8EeHPVfMdDIjpafslA2VAeNUgMUgKlU7lLHaV6K4+0c46Bmoi7YDz6dzcWlvcjsB/7U3Xe8fV3IK1VvvY/bz82n5xIevtyQ6ZgodoaC1DSEc2XIvRX0i0O0C8LU+TqtFqKwNdcah1aJuV6bj3Jphw4ahWUxXP3PfoV4TSLEQ+XQ93lSPSmZU1u11G0esxBs0DNCp9CUh7WqnmmVaAt3BhMd+f/VnkucgX3GFH/qe4Tae5iK+nvx3lmUkFV952pk4cLjGCikGDjYkvcAuMlgrZD0l43BdvpUkWIskR83UeIEu24B/p/nrvqSQXXQhKlHdVg8EHcX54SigfWDbd4Jt1TlJSvgDCfPVx1177t8QLsFOIho909zS+X1LlfCQODsbDZEdCIM76HIzPbZuSpM5XqlG7sAphXYpOTeV0hPA3+y+AwB/7OGecVdrMNYFYu5MwR4rcaJIhGOBLzg0YjMV/MZz2RdbjBq1cpbgL+F+aV/GcC7M7dkM+Psv0tLgwq8tN8vzilhd2NwslGgpd1l7aooQG0wPLELWP73CUQA/W1n0TZRd8yh01irucEeKaCDHmXVoiViKhqqx5gig0e8lL+jJINwzLYxeaHL5Nk7RVdv9chW8bi7xFHQfznK3c3I0S8y2pRVMasYLsxE+dvs7DhAAmvDBZ/8BLkfkxt0aGsxaGHDTin18uSzqcQibDMLxnj0w4MVV6OnQOR/vaMTy2wE3GgN2V8fpqnTwm3ckCDG5UeOVBf+gtnGEuDQEDkf6vYTQHSnj6BrV4brLw/w28dUAxUuFlEXCgO8y+RJBIa1onxzYTNgikRkskkKPzAZXOS7SOj1MAjQXMRpPxDtB2tgK8EKbeOzoqssHSiEMnJZ8Inr3icJ/ONZLxt4cIR39/KJH64nUyQs5L8CPra3SZqk1dWU5jGVySe7OCCA7V5X4mzbe9f1nO3JYMyEHdv+j2MmP6sm/GgIXjgxAfpogXFD7VNkHBJ2IrcBkJ44teEGOhEi10A4x/eTWC7M5sX2NGjEiiN5oO2lj7czL+JBcbLmpn5Tu5YThzfeihaEQAxW2HZjg2mP4VZTY37RkeJmichsMs76b0AJbFSA0m+5LHaRoOK5F092xA4c/NtV8ueth2CS7jPc9qhkXLt/bcOvOw5k+W0+LdI1NBQuPPDb7GKKd/OprL9pXB5snKZNaiyRqSBBfCiCDPT5L2cKKToVg51664YTpjtFg/eAGgOTlHlGOjjHz/jieDoZJLuNiDiVWk5509KydigTxo6l08Ey X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10837970-d9d4-41d9-78f8-08dd550d8824 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 19:57:56.7254 (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: DM3PR84MB3642 Received-SPF: pass client-ip=2a01:111:f403:2c16::81d; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM11-CO1-obe.outbound.protection.outlook.com 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, 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: , 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-minimal): Update to 30.1-rc1. [phases]: Work around the phase 'patch-program-file-names' expecting the file "lisp/obsolete/terminal.el" in the same way that guile-emacs does. (emacs->emacs-next)[phases]: Add the same workaround as above. Change-Id: Ia83ee362fb70ec437b6930ae661b76cb14589b0b --- Installed this locally on my system. Everything works as expected. It can find the eln files just fine. Used it to native compile my local manifest of Emacs packages and loaded those. Everything worked great. It found those eln files. None of the eln files have a hash in their filename (as expected). Honestly I was expecting to have to adjust the patches so I am pleasantly surprised. gnu/packages/emacs.scm | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) base-commit: 61428ccf41f21f5ea1e4f1eec722ef9b1efc3a0e diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c5e671c6a9..2e59e85f6f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -573,21 +573,19 @@ (define-public emacs-wide-int #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal - (let ((commit "881d593a9879f3355733f1b627af7cc0c12b429e") - (revision "0")) - (package + (package (inherit emacs-minimal) (name "emacs-next-minimal") - (version (git-version "30.0.92" revision commit)) + (version "30.1-rc1") (source (origin (method git-fetch) (uri (git-reference (url "https://git.savannah.gnu.org/git/emacs.git") - (commit commit))) + (commit (string-append "emacs-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nj3a7wsl5piqf6a8wnmfyjbpxp2dwl0r48flv9q624jx4nxfr2p")) + (base32 "172q4jsfhlccp5i9z7vsn9z1n8amdwb8ak1jqm7ybwpr5941whbr")) (patches (search-patches "emacs-disable-jit-compilation.patch" "emacs-next-exec-path.patch" @@ -595,7 +593,18 @@ (define-public emacs-next-minimal "emacs-next-native-comp-driver-options.patch" "emacs-next-native-comp-fix-filenames.patch" "emacs-native-comp-pin-packages.patch" - "emacs-pgtk-super-key-fix.patch"))))))) + "emacs-pgtk-super-key-fix.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments emacs-minimal) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'patch-program-file-names 'help-patch-progam-file-names + (lambda _ + (call-with-output-file "lisp/obsolete/terminal.el" + (lambda (port) (display port))))) + (add-after 'patch-program-file-names 'remove-help-patch-progam-file-names + (lambda _ + (delete-file "lisp/obsolete/terminal.el"))))))))) (define* (emacs->emacs-next emacs #:optional name #:key (version (package-version emacs-next-minimal)) @@ -629,7 +638,14 @@ (define* (emacs->emacs-next emacs #:optional name #$(local-file (search-auxiliary-file "emacs/comp-integrity-next.el")) - "-f" "ert-run-tests-batch-and-exit"))))))))))) + "-f" "ert-run-tests-batch-and-exit"))))) + (add-before 'patch-program-file-names 'help-patch-progam-file-names + (lambda _ + (call-with-output-file "lisp/obsolete/terminal.el" + (lambda (port) (display port))))) + (add-after 'patch-program-file-names 'remove-help-patch-progam-file-names + (lambda _ + (delete-file "lisp/obsolete/terminal.el"))))))))) (define-public emacs-next (emacs->emacs-next emacs)) (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))