From patchwork Mon Jun 17 12:00:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suhail Singh X-Patchwork-Id: 65419 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 162C527BBEA; Mon, 17 Jun 2024 13:02:22 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 CA5DF27BBE2 for ; Mon, 17 Jun 2024 13:02:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJB3i-0008F6-By; Mon, 17 Jun 2024 08:02:02 -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 1sJB3g-0008EO-BX for guix-patches@gnu.org; Mon, 17 Jun 2024 08:02:00 -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 1sJB3g-0001ei-37 for guix-patches@gnu.org; Mon, 17 Jun 2024 08:02:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJB3h-0002yB-Vt; Mon, 17 Jun 2024 08:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71592] [PATCH v2 1/4] gnu: emacs-org: Update to 9.7.4. Resent-From: "Suhail Singh" 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: Mon, 17 Jun 2024 12:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71592 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71592@debbugs.gnu.org Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 71592-submit@debbugs.gnu.org id=B71592.171862569811369 (code B ref 71592); Mon, 17 Jun 2024 12:02:01 +0000 Received: (at 71592) by debbugs.gnu.org; 17 Jun 2024 12:01:38 +0000 Received: from localhost ([127.0.0.1]:60899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJB3K-0002xJ-GN for submit@debbugs.gnu.org; Mon, 17 Jun 2024 08:01:38 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:39544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJB3H-0002x2-P3 for 71592@debbugs.gnu.org; Mon, 17 Jun 2024 08:01:36 -0400 Received: by mail-qt1-f195.google.com with SMTP id d75a77b69052e-43fe599b612so3560671cf.2 for <71592@debbugs.gnu.org>; Mon, 17 Jun 2024 05:01:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718625628; x=1719230428; darn=debbugs.gnu.org; h=mime-version:user-agent:date:references:message-id:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZGwKRDVdQLTgCdvPHnXr2aUDUUuf7tzHYO1P5f0yuTI=; b=ZtB5YEmanGaebjfttx/dbZMu7Ii3YpsXYMWJ4rVS398/+C0U2cQRu7EXOTldzinyCW +3PR3jG1C4jCsdJwXqwC0eSvGvcOaEpASSDuftBiWCpbAwokITNsrvXH9ZZIYCr5xi50 heLhNxY3uVVHnDvhprpLGYIyEPFuYaxoWtYdELuRj4ZQ1MO9c9dLy9RhWxdSQuZNmtlJ IiZBK1sVRBM1mNEC43KUG9XWM/Q2YxtOjN2/QxH4OnQGdA0pwBl4wt18tpdEhPUfr95W jrdlQLKUAdChDFLrFMM5niUsrqa8/KuGRmhPXdXg50AmxQ77W/Ywv+UfSvOvA6VOXlhU XucQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718625628; x=1719230428; h=mime-version:user-agent:date:references:message-id:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZGwKRDVdQLTgCdvPHnXr2aUDUUuf7tzHYO1P5f0yuTI=; b=ZxPs+Z6s7PANeDgE3+yYkQaKSbVSHuXtJBjTnLZP/1SmUOKkNSAGgFFn/mJSFipcv9 5Qlz5eIYnGA3bMKhdbwtxjbm3Zb2Kg7ljuUjg2ijLTmtIzDLsQ15nUJ1VxFN9Y2kf9RT TL4CCLWwPsp/tH3PmDrEBKWJTM/tLTWh0qmis4vd14NTveySBnUfP4X+NFntXUVS7/4y ScXNknx4CIf7GSPwVpKpXzFrK6F83E7zBLhDi92iVTUjyvK+nK/qrvYNkGIXIlomv7Oc FkYwLy0xNiKFClPpeogXYzc4M9gcaADdsXI4lgETAcicQ/1/5tgD6IhAOiXhYQ9V59tg RjOw== X-Gm-Message-State: AOJu0YxPW7kYDlFTLTeqA1yXtyLPbsB3cJua1nFvhY5vXfJsiob4Ye2u KEXh0MQYQMAxEBMZD2Kv/BDBVo9RyweotL/lrdaD4cwMEEWGcBqoaNBXAoty X-Google-Smtp-Source: AGHT+IHNSH44lNJqenMv6msFDvahHrMHRmiHm3HDPRno4/+KJ0eTRcXHVArGmK1uCDn3xDb27Nwj3Q== X-Received: by 2002:ac8:7e89:0:b0:440:565a:920a with SMTP id d75a77b69052e-442168845cbmr104742431cf.2.1718625627615; Mon, 17 Jun 2024 05:00:27 -0700 (PDT) Received: from gnus (static-198-54-132-177.cust.tzulo.com. [198.54.132.177]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-441f2ff9ef8sm45932621cf.89.2024.06.17.05.00.27 for <71592@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 05:00:27 -0700 (PDT) From: "Suhail Singh" In-Reply-To: Message-ID: References: Date: Mon, 17 Jun 2024 08:00:26 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 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-xyz.scm (emacs-org): Update to 9.7.4. Change-Id: Iec5f62a5d4a8c23f939aef118473b81a2dc9122b --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index da4a2340fe..307950aacd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17118,7 +17118,7 @@ (define-public emacs-neotree (define-public emacs-org (package (name "emacs-org") - (version "9.6.30") + (version "9.7.4") (source (origin (method git-fetch) @@ -17127,7 +17127,7 @@ (define-public emacs-org (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0v4b3yl4limrq3jgf0jvvx73cs7d36p14c2x93pdvn50mjykii3f")))) + (base32 "00crs2q4yvmv2jgzmcfyl2g6m7g42zpggyssmcj8anwrsp748z9b")))) (build-system emacs-build-system) (arguments (list @@ -17156,12 +17156,25 @@ (define-public emacs-org (for-each make-file-writable '("babel.org" "ob-awk-test.org" - "ob-sed-test.org" - "ob-shell-test.org")) + "ob-sed-test.org")) ;; Specify where sh executable is. (let ((sh (search-input-file inputs "/bin/sh"))) (substitute* "babel.org" (("/bin/sh") sh)))) + ;; XXX: Fix failure in ob-tangle/collect-blocks. The test + ;; assumes that ~/../.. corresponds to /. This isn't true in + ;; our case. + (substitute* "testing/lisp/test-ob-tangle.el" + ((" ~/\\.\\./\\.\\./") + (string-append " ~" + ;; relative path from ${HOME} to / during + ;; build + (string-join + (map-in-order + (lambda (x) + (if (equal? x "") "" "..")) + (string-split (getcwd) #\/)) "/") + "/"))) ;; XXX: Skip failing tests. (substitute* "testing/lisp/test-ob-shell.el" (("ob-shell/remote-with-stdin-or-cmdline .*" all)