From patchwork Sun Jun 16 15:29:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suhail Singh X-Patchwork-Id: 65402 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 A3D8327BBE2; Sun, 16 Jun 2024 16:39: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=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 4FE2B27BBE9 for ; Sun, 16 Jun 2024 16:39:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sIry9-0003NB-SE; Sun, 16 Jun 2024 11:39:01 -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 1sIry8-0003Mu-PC for guix-patches@gnu.org; Sun, 16 Jun 2024 11:39: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 1sIry8-00085V-Fd for guix-patches@gnu.org; Sun, 16 Jun 2024 11:39:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sIry9-0007S3-Oq; Sun, 16 Jun 2024 11:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71592] [PATCH 1/3] 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: Sun, 16 Jun 2024 15:39: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.171855230028535 (code B ref 71592); Sun, 16 Jun 2024 15:39:01 +0000 Received: (at 71592) by debbugs.gnu.org; 16 Jun 2024 15:38:20 +0000 Received: from localhost ([127.0.0.1]:38404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIrxU-0007Q9-4H for submit@debbugs.gnu.org; Sun, 16 Jun 2024 11:38:20 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:41431) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIrxR-0007Pc-Is for 71592@debbugs.gnu.org; Sun, 16 Jun 2024 11:38:18 -0400 Received: by mail-pg1-f193.google.com with SMTP id 41be03b00d2f7-6e9a52a302dso180920a12.1 for <71592@debbugs.gnu.org>; Sun, 16 Jun 2024 08:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718552230; x=1719157030; 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=wwVpVo1O8Ss+Rx/qc7pQGg1mYgqjo/LfgK1dwEXYd+g=; b=e+70dsBQzIoq1QR4HF/5XSb4rMHH3dzAuGED2T/BR0+wDZLZYoJc5yQu2T4HKfe7sg QFcNR+2ShfBKIKKB4d3IsMBOOU+52j9erNNBYEcy2OtOQt5cZM12EEkxP5XFGN6UEnQK o/30Out5yi/71ZRttwQGt2pzJPXjWW5uBvPh7sx5J63dfn4ZrlmAAKPr52VBQ7B+4/0U etaqOO4mbRbHF1yCCNJbJUuEKfR8uRD4Z4Spx6KketF9/Et9xS2MQ0exoS0r1JVrtsE2 Z1HYgpoAUgH/MLSYmXZr+fbHSu0Vthek2jVeCDlqZ75tU6T3JehAZlhU0EDfa9HyGUd0 7hFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718552230; x=1719157030; 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=wwVpVo1O8Ss+Rx/qc7pQGg1mYgqjo/LfgK1dwEXYd+g=; b=WG5XkerCvsyXpsxwIs1dlhlTm+wHCBCs0jM2+MaSDRthm3pvA+RvKxSMDyHE47wBvp sX1sviCIrGzqfFYGwPizErMLd2gbkMdjZbqiVjaUHfNXCM84SYnNXN1mQrShlZ4o2MFj KgQP85W5039wIkGi7PMKviXYwW6eYm5uS0ilW+JgyAeDQF3wZfUjHThEtidm/uG5A3KF 9oh2qIZVv7gn6QI6vv7gS/XbTPsxdQIQ8e565MZZaVogWcHT51qlwUwZcQW5ChevoyE5 qukKin61Y77t+UqEJ5Mc6fvsTQZ/8FgylhUtHQG1I/RmwoqzsSoFxLfBRSAuqdyJ0HZW 4Alw== X-Gm-Message-State: AOJu0YyLYAkm5XzdVdV/EEG/qDgGl9hL4k+1ie3eGJhsBcwCg687Pw5u s7YcdpV3i40/KBOSB2CWi66le1j2ZZOdqg0Dy32trsx3L0bGbImSvL+/8irP X-Google-Smtp-Source: AGHT+IGetZMFK5X0ORLVoCyxpAKbKFDfMT3QT+30KQMTlf3Kxx3cvpvEX+5V+Z7VttmNJcq50Wfq5w== X-Received: by 2002:a05:622a:551:b0:440:5f14:165a with SMTP id d75a77b69052e-4421687be19mr88496111cf.2.1718551767038; Sun, 16 Jun 2024 08:29: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-441f2ffb37bsm37145591cf.90.2024.06.16.08.29.26 for <71592@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Jun 2024 08:29:26 -0700 (PDT) From: "Suhail Singh" In-Reply-To: Message-ID: References: Date: Sun, 16 Jun 2024 11:29:25 -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 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index da4a2340fe..9a57a0fbf7 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,8 +17156,7 @@ (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" @@ -17166,6 +17165,11 @@ (define-public emacs-org (substitute* "testing/lisp/test-ob-shell.el" (("ob-shell/remote-with-stdin-or-cmdline .*" all) (string-append all " (skip-unless nil)\n"))) + ;; XXX: ob-tangle/collect-blocks fails because the test assumes + ;; that ~/../.. corresponds to /. This isn't true in our case. + (substitute* "testing/lisp/test-ob-tangle.el" + (("ob-tangle/collect-blocks .*" all) + (string-append all " (skip-unless nil)\n"))) (substitute* "testing/lisp/test-org.el" (("test-org/org-(encode-time|time-string-to-time) .*" all) (string-append all " (skip-unless nil)\n")))))