From patchwork Sun Apr 28 17:07:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 26584 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 8285927BBE9; Sun, 28 Apr 2024 18:14:56 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS 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 4F38B27BBE2 for ; Sun, 28 Apr 2024 18:14:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s186v-0001KK-Ks; Sun, 28 Apr 2024 13:14:45 -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 1s186u-0001KA-Ri for guix-patches@gnu.org; Sun, 28 Apr 2024 13:14:44 -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 1s186u-0004Ih-JG for guix-patches@gnu.org; Sun, 28 Apr 2024 13:14:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s187C-0001Xb-92; Sun, 28 Apr 2024 13:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 28 Apr 2024 17:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70632 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70632@debbugs.gnu.org Cc: Morgan Smith , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by submit@debbugs.gnu.org id=B.17143244495879 (code B ref -1); Sun, 28 Apr 2024 17:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2024 17:14:09 +0000 Received: from localhost ([127.0.0.1]:51298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s186K-0001Wl-LA for submit@debbugs.gnu.org; Sun, 28 Apr 2024 13:14:08 -0400 Received: from lists.gnu.org ([2001:470:142::17]:43110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s186I-0001WD-9I for submit@debbugs.gnu.org; Sun, 28 Apr 2024 13:14:06 -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 1s185n-0001Et-5t for guix-patches@gnu.org; Sun, 28 Apr 2024 13:13:35 -0400 Received: from mail-mw2nam12olkn20801.outbound.protection.outlook.com ([2a01:111:f403:2805::801] helo=NAM12-MW2-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 1s185W-00047q-5j for guix-patches@gnu.org; Sun, 28 Apr 2024 13:13:34 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XAbPH8EvxGx3Lc6zcGp4GpgNHqnc1KTBtS3NtVN73Ba0IUEXADY+JB0NDJGE2HoHPeuP63VlzP1726Fia3egIEy3mrymtT63dFONPxSSrDXnaTfpO2w5jWahDSU27+IBzsyR+g0/zTbyWqIzM8yI9yJBjS87UXrs9q8bhL2ZCvdepCSbozEc3k+2wrDJQbcbTCnfx32S4XCF/dBEPbESK6PN32thnS0ZOVbMdRNXwhI4cGnBBGoZlQXXfO+++z/8NrWENp2bfBkIGiCtoQEFKdXlO+RNE3IxktVXTDICV7xuvEUdUbJb9hfEBj/qnhKdACC6uIH3k+LW4dfn9+Q2mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=yl0EgJfKwudv3DAfkACW/bgn1IJSQ/ulUJQkanu3oSQ=; b=TJbshCNalrMFc2fa6kIwAG0a2rBarVRxvPT8kxwcoMqDNNYCGz7Y5mtN8KaoN2XY3jtYqkXRJ/7QkUXMDVGgQ+5wWjZNm1H+e1QNH34P3/byROB/ZPkxAb8pVQ1TEqup7+ojxVLYHstzNSQdtFnIEn86axX+MSqRGWFN5pjyErJ2NBt3AAqRzChEY87YPV8I7Zf/2cXlriPqgg0bFBeyz9NHlmBwbbqRlv3kePs/oBXVJGI5Ns87NA+cFu94eFVKog6QHNJ4itr41oyR4QE8I/lYgr8jrUQzKxOPZlrzwE32Zn82g/ivK8OgeFzzb4nmTXxrQmFqHa05FNDuhoYHTQ== 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=yl0EgJfKwudv3DAfkACW/bgn1IJSQ/ulUJQkanu3oSQ=; b=rVEWnGcGQFe32UNWLzdf43ZakzSBzsNb/UytaGwYPSuoH+aWg4+na0R/5kFz6MoHP9lC64h8GMl8DdQhH4q6KkXOwk7E/R5EV5dizg9gqVRPMFNzFG+P7q6NY147yocJ8mXbjLafm8jS3cjZXexC9EUb8I+jAhp7HmTUEnJ5f8or3R0nAFqvWB4qTNjFgWXVomBzBE17i8zZCqhhq5ws8e1whlwo+lNqPTGNzKox1DRz8kCg5ZAqdM9K1sY3713EFTPTlKRX1PIxLEow/6DYrxilSYktT/hRD10hqYJHLlK7Qf5D65n3AipYFuceo7X0EQH048ld9aSDxo6eVoVpEA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by CH3PR84MB3852.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1da::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Sun, 28 Apr 2024 17:08:11 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7519.031; Sun, 28 Apr 2024 17:08:11 +0000 From: Morgan Smith Date: Sun, 28 Apr 2024 13:07:23 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 X-TMN: [S8BaoAYTNvlb3+dqUG70ElfI0GjYY2zK] X-ClientProxiedBy: YT4PR01CA0164.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ac::6) 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_|CH3PR84MB3852:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ef68ffd-7e1e-4cc9-a26b-08dc67a5c86d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: ZZ7OGACgDU/Sx39Aymc1gch8Am0Lw/2pf2TClZ1Sld5fLr7Ft4eV6qhuS6tZqmnQBYP00r7YdKvv+Kg+tw95jVbPUoIbwu+xB9kMgCXPmEhp1DWMs1D+XGewPP5njeEyBGfxRTcIYPBKA3ECveqGH8A1FLuZshtWOMqPsJXmVlWA2dBSZidOrMXSTmWcqIDtE6M4fJWn2VndXKU0956YTweq6tTMfRcrCHTd19ur9IskOh9WD6TTD7oxSne47ODh0rcd0lrLUpOPCWy9sxNcQGPvAGvNakW3+IPJSDiVpzn9/2HjLf334d5hX8VQgx7da0mzDOj9LBPeQENVvWYcMAiZyDnAzArODHR+COKLm1FEq74Xof8G5CcfC217PrRQ/QRXHyOB1EmfDaSfyh9OhgFFPmNa5Lz+7H5IdpfEhOjXfaLJ8F+RBimGJU3pxjqtVFW4F3hn2v1fj40+IasisRWoHfohOTorBAvr7qOC8wvpgxMFi2K3Ude3Q82vp/OvYtyJezZBk/QHBldkUH8vZf7Boq6u7uZBX72Ji8r+QcaZ6XfxZk65j/3sVt0V9o1umF/LZhK+fjryCVhoH4UzYe1JUIfgwB+bJdrOAKoTwvLXP4gb8VYc+MebpSgP66Yi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gbureHH396ug3kUw0x2E0qYZZf/AHx6AOWiC0gzKSGHg4CJOiPO6Oeps9FYJnxWSqrDecpm+JPLtp7N3LrfGpR03WwrEj5t4Hi58YLTgax40B7IdG5GwVcEfxQgtqYqsmjLOtXTlmHjxMZVi4Y1DEBBFqpqw5wTlvAxnx7W8hi88N7VQteSuGERjK1GLjlNSnF0Q07B2HogGsNLsRgUTbkwXbZAZXohYTjbSSKqgJAlMxtPwszprUhCL46Gnt6lHymwhpAHqz44NfOGLWy87USt6tVgcGnFQ3vSqWo8qEwXTHrJbbJpQXRnJCSWpWM28w76keYsEfjlW3bukZc053I8ibSiU9x1/oZPnteiILwaJ98XneiY+HCw6I4wImfv85UEfW13cnfHpp9rG7UA6Z39cdw1RgtziIX1FsqzJ+akHKkErOrtoooFo/GtMU8v9A2vzsH/NKozVXK3VbT9bFq/DtDBoyr0b/wNrcFKwhnXui33aPWtObtHMwb1KHoI9bEknuk2yD+DH9JtQqdDhO/FvmCxzzC5+Nlf9+u5QMPrNhhcGPwB+BQP+XoZKOPusmFw88R1J4Edm2FDNRPhK30c/rNBBfotT82jsG4um/sKHx9Bi7N9LyutdjO+avAxS8xE9geUaN69uM+HgMRaVJ54+2MKC1Ru2enKmMan/eNSk07SJhN+zCSJpWAIYFGbwV/GbGnP/m58NaFjjsrB3LLZY8INqyxXp8WyIITEW0jnUKvHCuuEsUAhFPhNFXNgYd36SH8M321y/vKoV3ANGoLlaSmg2w/2oM8Gk/0lEZ6GeASruUW8sIm8pL5ptESaFAyaXyqPtdTp/XtkZplRnE3cLYRdZ8hiMfSfNBVdXBNVm2y7P8rKTNlIbbzB3rPIMUYoxtJdpR2yKvF59VRard0wKZyBxcw8jDqfft63ixPCzGBqaItt5P2UhFwmiEMAr3MEn6bGV5iw2zDkKQPKzl/zJESnCGaTTxOcxXub2wOxyMewAJj5BatMD8tjiy+oqJZ/n/4TUrk9gUYnidvx9JowzvbNG5k9vW2FO47WsUnFqnDzMnngKqaUEGSfAFwEpbjABWqgHodF5atGsKzBMTCUXK4jqlPpqJgT7VsncBNHSatdy1OcOaUI3lnUxt7OeKYJ6cc3qhIGMbpITig8aJH7H2XysTqRq1j9PkvExG7q5e5F1qa6vGmwA28Nu28chdR8lcC0tY1BCkD2cu6W4PuJ8eHVNMX5qsMJDBVFvMc165mKoa37NFUonPX+i496I X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ef68ffd-7e1e-4cc9-a26b-08dc67a5c86d X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2024 17:08:11.2359 (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: CH3PR84MB3852 Received-SPF: pass client-ip=2a01:111:f403:2805::801; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM12-MW2-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, T_SPF_HELO_TEMPERROR=0.01, T_SPF_TEMPERROR=0.01 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/aux-files/emacs/comp-integrity.el (expect-help): Update with new terms for function descriptions. Also return the description instead of 'nil' on failure to aid in debugging. Change-Id: I63a3644c91dd7817a72ab11ae87ec4fc8fdb2c1b --- Hello! Trying to build the latest Emacs from source fails because they changed the names of this stuff. I was able to successfully build the latest Emacs with this patch. Thanks, Morgan gnu/packages/aux-files/emacs/comp-integrity.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) base-commit: 9f183c3627a006e8fd3bb9708448bc05a6204e6d diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el b/gnu/packages/aux-files/emacs/comp-integrity.el index abe7e7c0c9..d969f58622 100644 --- a/gnu/packages/aux-files/emacs/comp-integrity.el +++ b/gnu/packages/aux-files/emacs/comp-integrity.el @@ -16,10 +16,16 @@ (let ((desc (substring-no-properties (with-output-to-string (help-fns-function-description-header ',fun))))) - (cond ((string-search "native-compiled" desc) 'native) - ((string-search "byte-compiled" desc) 'byte) - ((string-search "built-in" desc) 'built-in) - (t nil)))))))) + (cond ((or (string-search "native-compiled" desc) ;; Emacs <= 29 + (string-search "subr-native-elisp" desc)) ;; Emacs >= 30 + 'native) + ((or (string-search "byte-compiled" desc) ;; Emacs <= 29 + (string-search "compiled-function" desc)) ;; Emacs >= 30 + 'byte) + ((or (string-search "built-in" desc) ;; Emacs <= 29 + (string-search "primitive-function" desc)) ;; Emacs >= 30 + 'built-in) + (t desc)))))))) (defmacro expect-native (fun &optional feature) `(progn (expect-help ,fun native ,feature)))