From patchwork Fri Jul 7 20:21:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 51627 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 30A5E27BBE9; Fri, 7 Jul 2023 21:25:23 +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, 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 7590B27BBE2 for ; Fri, 7 Jul 2023 21:25:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHs0n-0006im-Dt; Fri, 07 Jul 2023 16:25: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 1qHs0m-0006ic-6h for guix-patches@gnu.org; Fri, 07 Jul 2023 16:25:04 -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 1qHs0l-0003ao-Uk for guix-patches@gnu.org; Fri, 07 Jul 2023 16:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qHs0k-0003JC-0L; Fri, 07 Jul 2023 16:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64523] [PATCH] gnu: org-mode: Fix build for development version. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 07 Jul 2023 20:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64523 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64523@debbugs.gnu.org Cc: Andrew Tropin , Liliana Marie Prikler X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Liliana Marie Prikler Received: via spool by submit@debbugs.gnu.org id=B.168876149812704 (code B ref -1); Fri, 07 Jul 2023 20:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jul 2023 20:24:58 +0000 Received: from localhost ([127.0.0.1]:43870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHs0f-0003Iq-SX for submit@debbugs.gnu.org; Fri, 07 Jul 2023 16:24:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:50578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHs0c-0003Ig-Kn for submit@debbugs.gnu.org; Fri, 07 Jul 2023 16:24: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 1qHs0c-0006gQ-BB for guix-patches@gnu.org; Fri, 07 Jul 2023 16:24:54 -0400 Received: from mail-bn1nam02olkn2016.outbound.protection.outlook.com ([40.92.15.16] helo=NAM02-BN1-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 1qHs0Z-0003WC-8j for guix-patches@gnu.org; Fri, 07 Jul 2023 16:24:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RR2oPuEaHpP02LP1XPpc601iBQey6MuQrKRchjnigW1w1PbG69n7WNWhoMO5TUrAe6Sekia5s4bDpSOqlaZwLKgFvukgCdrwSQcbDcAVl1Sa+Fptm8UjxIzuR4cvU6xw5LlWLb4MnIP9z21KpKYUUCA4WadjPD8buNNC6IK+aE42TDhW++DUBxAAeYOa6JN0acCtJQ/4DcLy8ggyjpjH0XPbTtKd46vmmRB/hM1vHo8hEkSDhrrdMIbvCcFwK435FwTlbRDIoWbfMnyMCWAZWoQ4ds8aNzsHC2r4OajjQA+GxDFzdIoLXukNHrQ45kPdCi1XuA6YUZBzrNX6VQkBPw== 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=qm/ye0wByrGqFgazSXfyxYIveCH8mU3+RjDn6u8e46U=; b=iSZKZMQ5anv4atjgm/sxWb1YcBdGdCdpfyHw8xLRKhoFbLr/aeWncRj8Jiweba/nGfdiOJtkhCNL4lgBgGcnex7Yl0Od48pO8eLtfabk5kqoXdifrzKx+0kLJlFU/8arxh8uDrwnJe9H3fZgJmmwDsrQHsEEWIiuX0hTYs4JEr+kLA4+AzBlzGCvEL17ngAFXaFA+Qcc0wtEA71PpUANpGYfDSa56eEm6QbhrjMo7EGiLG/DL8PxoZ05N3seBsZfK+XurQOYX+SG6720c7HnNB7ig4mFPfwoN/gjXtcxQIwbm65P95HgyCayGoTIZm16hSraX8YRFND3EPiQL2woyA== 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=qm/ye0wByrGqFgazSXfyxYIveCH8mU3+RjDn6u8e46U=; b=td2O5UqEUzOXPXASi5Pv87N2llW1zhzzLVYOu0BlJJR8iEP0BQ77wSznuQH7aLGF+mR/b8uahAgycB4j2wXGnGKxSudsOzJkw4xAaeBp2XrDYLGPp4rzRYWvFGaEs04Ktp/dwXdtgbvOwRFsBpG3C3m9W6k8yE2vqxBPSs+25GFRUPaOBRqT/CJMJzVLxb+2J/p2Twwn5Ly4B03jf7Ft6rUR2YDOKAA2HCzFdHh226RMPTfPOipw+uykhJmr7rxgFZZVd4xcavXMiwqhVBSHX3NMdVYMvw6tJDJ8o3BBQuwHEproFu1cvsbIdnnDEG7Cs64LuEGGPhzO8Q5ys/HQLA== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by SJ0PR03MB5872.namprd03.prod.outlook.com (2603:10b6:a03:2d6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.26; Fri, 7 Jul 2023 20:24:48 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::d561:bdf5:3af9:b03e]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::d561:bdf5:3af9:b03e%4]) with mapi id 15.20.6565.025; Fri, 7 Jul 2023 20:24:48 +0000 From: Morgan Smith Date: Fri, 7 Jul 2023 16:21:50 -0400 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [62rfYhpFPKuHO6kttLnDJf6axuEMlO2lY3znXXhbR/jspTxI1jMT3g==] X-ClientProxiedBy: YQBPR0101CA0309.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:6c::13) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <7cfbf75f887a5b43263420129a8808f7dc786591.1688761307.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|SJ0PR03MB5872:EE_ X-MS-Office365-Filtering-Correlation-Id: cddb138f-cae4-4f7b-f9ad-08db7f2835cc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gl3re4seMmV+MQrm/58DzcxULrNCCCbPoU50ry5UDAVo47oh0JEcJkaYj1zEIM64IU8MJgFKLaIPSsUCqC2KzrJNZ3hF9EIVREBdyhFjZHteoK6yeNC5XXpGacICwW0KSlTQINC7X2yapLDbFV8aAiPc7juA/lHokjlCYpKcSzL+mrtE6ZNFkGYKjvXwB8Htz1sjBkKC+aK5nNHg8bJIZrcSsFUXF5WIlYHE9vK3K/eiuon80F/nWLtIDjLvv//qYDvoSrE4ZSPXKnJ5dTS/Wpi56F2eAoCfK0UPXDCKAcoLGCJrkr/e5VHDU9G9YcIMKe5ef7Ip8ILUtmyB5/ygjvz8jCXY0UMFlPA+jIcXYnBbs4og+Wo7MQyDS3UB2p0Cc1h4hVPODa27ztEy4aWf3WNf3V9rSbHXqq6AQJ5eIigU2HmsTolZWHr+njpOYcbNsbPqdrPVq2uvG2L1etGEq75k0cgcLxJKkAMrbsrDgSMEeQULab4pvbRVrk2Fl8eZfC6MljjN5uHlSTbN7/Buuk/xxUU/UXx/RkiRW6YSc/u7edPeKYTJ8T74byNY39+w X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iA+gvnTOdQL/yb2ON71aQ3y2oFhvrdMyJD9H+z6oKLq9GKfdIkXAgXcGL8ikwhVQX9Rtu1vjtd91HSnKYfgNW2EWmTvscm1+n/mbucsXLxAZGrAwNJ23OPriNtPVrmXxIIF/mXSgzyOhIGFC0NnE32JUocr+rfk+hcZT1+O9XMdyQ6YHAlflheJBk0ZLVf/nnIjidYXZRhY8GfiL79QzTbndwElqIPMX8ixl+U8rS5NXYbFIXwNhceOuhPJj6GllUijP8k8ysv9e5BcAs1zvP/eXZl2lGwln2inVlTpi/WxFSpfet5YTAAaRpTSOO2j65udzZWQiqgxvCEFdv9rCzuuHlAtho5KgxaDNJIBYp0Beqdkz0HvKgEbeyhLqONj/EKlky9MPwYysX+Uscs6hfC9kN0F0J2zGb3RO0c5ZgHfMbc84W9SjnHdEN9U+7EV2QVfRQUHQNJQLim4JsKoNfyy1DDEuhbXX38GcISIQi2cDr/VntQP9HDVjSVoC8/k5aYwnh9Q9QJ4EEr0pDK5JKLjDBuihV3Y3You0EIoKvgb4GT2AZ5HJmkzGyBl83W3o0iptLRcEdV0ACM5eVUtZndC4sKmV7anc9OS1TeRMy4nFyJMpmX6TavEoYVXBDlWCIZxQjug/HXyb8NsIgg+hl0bzPWliYQkX9UcPgEmb8skR3YfMfzmur7yEyzUMwd9GilSjgHH2fzjNhugR0t+d2thQcIG20+iVQNILx8lMZ/xxkirUg+7h2sS78tcW2HQggbHT3lfwhBEQCKq3uv1bkkrNiZ36z9P5AOImO97ZlPIQxzsKFTDwTO8l8wxfMNVO6ktT3gaTxps3b+t5QJ13Hd/fvzXlIGaqi6dz2RDHOkxoSWY/3NK6qPUGzDDN/+ZxPLBkyUJFy7ss8h9JAx66fIqFOp3IXO9tYsEUCeznxQ2PA0mIY7gx4mCCsM2D8hOP+E5ghYG1skA/FkydiT6uqs78OmvuznlLzq0YgBOsYmg9ke//vZv9R/v0apmIpcPUj1igX3r0WSQ8eLlSBivFTJfQNO4OX3xWkEuuhYTcr9ZBiHLLrCvao1iAkoDz3bnYMrkDpXCKpfR0/s558g/UzkHfTcpTuUo9ESHpsWY14ZAVXySYEqFHJ2IQVwPvCXbZl3U/jU3T/CeqdyUfGWYdcXZb9BvKEHBBQyk0ijnuGC5R8FMINAqPKysuulIJGhD86KTqsWHKvNv7nVmWczJkVz5a558BkBf9PlZjfaSFodpCllHNbbuI85CyDPzlkso+0tF4Qws4YX0VrPr6RIpVqg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cddb138f-cae4-4f7b-f9ad-08db7f2835cc X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2023 20:24:48.6380 (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: SJ0PR03MB5872 Received-SPF: pass client-ip=40.92.15.16; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM02-BN1-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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 This fixes "guix build emacs-org --with-branch=emacs-org=main". Or at least it will once they fix the recently broken indentation test. * gnu/packages/emacs-xyz.scm (org-mode) [phases] : Make all files in examples directory writable instead of being very specific. --- I'm sneakng in a copyright fix for me here as well. Hope that's ok. I did non-trivial changes to this file in 2022 and 2023. gnu/packages/emacs-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.40.1 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dbe736e56e..fc1a6ec8de 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -76,7 +76,7 @@ ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2020, 2022 Fredrik Salomonsson ;;; Copyright © 2020 Eric Bavier -;;; Copyright © 2020, 2021 Morgan Smith +;;; Copyright © 2020-2023 Morgan Smith ;;; Copyright © 2020 Peng Mei Yu ;;; Copyright © 2020, 2021, 2022 Niklas Eklund ;;; Copyright © 2020 Marco Grassi @@ -15728,11 +15728,8 @@ (define-public emacs-org ;; These files are modified during testing. (with-directory-excursion "testing/examples" (for-each make-file-writable - '("babel.org" - "ob-awk-test.org" - "ob-sed-test.org" - "ob-shell-test.org")) + (find-files ".")) ;; Specify where sh executable is. (let ((sh (search-input-file inputs "/bin/sh"))) (substitute* "babel.org"