From patchwork Fri Jun 2 17:52:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 50550 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 ECFC116B17; Fri, 2 Jun 2023 18:55: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 B19651669B for ; Fri, 2 Jun 2023 18:55:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q58zQ-0004U3-9h; Fri, 02 Jun 2023 13:55:04 -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 1q58zP-0004Tr-1u for guix-patches@gnu.org; Fri, 02 Jun 2023 13:55:03 -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 1q58zO-0002jr-PE for guix-patches@gnu.org; Fri, 02 Jun 2023 13:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q58zO-0008U8-Kf for guix-patches@gnu.org; Fri, 02 Jun 2023 13:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63854] [PATCH] gnu: po4a: Fix SGML tests. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jun 2023 17:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63854 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63854@debbugs.gnu.org Cc: gemmaro X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168572846632567 (code B ref -1); Fri, 02 Jun 2023 17:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jun 2023 17:54:26 +0000 Received: from localhost ([127.0.0.1]:40834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q58yn-0008TC-OG for submit@debbugs.gnu.org; Fri, 02 Jun 2023 13:54:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:37322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q58ya-0008Sq-7H for submit@debbugs.gnu.org; Fri, 02 Jun 2023 13:54:25 -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 1q58ya-0004Kv-0K for guix-patches@gnu.org; Fri, 02 Jun 2023 13:54:12 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q58yY-0002Gz-D0 for guix-patches@gnu.org; Fri, 02 Jun 2023 13:54:11 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1b01bd7093aso13787125ad.1 for ; Fri, 02 Jun 2023 10:54:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685728449; x=1688320449; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AeLZYLDd1IHK9AvpAX8cTC/NW8WkBYI3pnnbgE9CTkM=; b=CLdiy22DoEQdoc6bIwbtxdPQANa0V+BzNm4UDer3IKKAYwVpIpR1hBtP5yBCxpnRBk buAwUJSKLPj32xTfYDtHltLEEnis7NtO+LuNTSml8N7JGIULBI/jR1OxCML8ecHzzob8 I1NxZUCYJUpvj1viAn/TGj4FxSn2OMTxC0HxfMsCyl7C8Z8LvGlRf+fKvS5DXQqPn3vw zZcqagqkBgDNE2oDkUJFJmRCN+Qn21sb6io4UPyCX4lMsIMSHmAbvI67Kk07vtRhr6eU tFVSsX3R9AI9D4Tknn4Zv3vtvvgl73/8Qo4xo/AJdwX8rMzILlzEAggODc0oFJffbbRW CF3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685728449; x=1688320449; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AeLZYLDd1IHK9AvpAX8cTC/NW8WkBYI3pnnbgE9CTkM=; b=MGyeDxjnXuh8wrLb22dlKz1eFv+M/TOQa1YxYgCOF/q4r1lRdL/6CJ+byOgaxSSq6m Jc7WQ6pidh1jiENZ7i3U4Ys6YDNQrVeZa3plW6WYtAt6Bjyiz3iu1OPkUhMiyDEi5xQs 5JmtPEczpfZTA5MaFjiTbixDJpRfjNcRsHq1493GddXyvIlGkR9FxF//c3FE2me9uXCS L+hgn7KTbgaIc1Fzkcx4XGKFFQ5qNzBHQJpCg7dWzfFR22oHxfEH9vTnlcqPkCE2w01+ t6LVyKqd4pqCEFRxtt6Cvh1mxk4AyAuGpQ+VzmhQbRgRfqWbeVGLTjXxurOfXGt2+eoF uvvw== X-Gm-Message-State: AC+VfDySXYbSTeVZ+cs0kMAA3C20WxRKf+lpb9JHq3XoY4WlRE8WhS9i wV1nWbFAOKFmuXWU8Owxs7QdYNM+XCfiaQ== X-Google-Smtp-Source: ACHHUZ6Rx+VBzFyavniT7eHrGa/Ym8ogP8c9Lv7B40A1Ch1jBLcCEDFipPDaZ0KdtulZDv+loZMQDg== X-Received: by 2002:a17:902:b68b:b0:1b0:31a:5f91 with SMTP id c11-20020a170902b68b00b001b0031a5f91mr531897pls.67.1685728448681; Fri, 02 Jun 2023 10:54:08 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 12-20020a170902c24c00b001b01547d0e8sm1653917plg.142.2023.06.02.10.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jun 2023 10:54:08 -0700 (PDT) From: gemmaro Date: Sat, 3 Jun 2023 02:52:56 +0900 Message-Id: <787df376b4ca9aaf15b8eda7c04ee7ae984d78e9.1685728331.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=gemmaro.dev@gmail.com; helo=mail-pl1-x62b.google.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, SPF_HELO_NONE=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 * gnu/packages/gettext.scm (po4a): Fix SGML tests. --- gnu/packages/gettext.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) base-commit: a7d9cd742c3149bb014db95f88d1158d590bc124 diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 9387f4fb8a5..0d66d492d40 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2019 Miguel ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 EuAndreh -;;; Copyright © 2022 gemmaro +;;; Copyright © 2022, 2023 gemmaro ;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -280,10 +280,11 @@ (define-public po4a (wrap-program file `("PERL5LIB" ":" prefix (,path)))) (find-files bin "\\.*$"))))) - (add-before 'check 'disable-failing-tests - (lambda _ - ;; FIXME: fails despite of importing SGMLS - (delete-file "t/fmt-sgml.t")))))) + (add-before 'check 'set-SGML-catalog-file + (lambda* (#:key inputs #:allow-other-keys) + (setenv "SGML_CATALOG_FILES" + (string-append (assoc-ref inputs "docbook-sgml") + "/sgml/dtd/docbook/docbook.cat"))))))) (native-inputs (list gettext-minimal perl-module-build @@ -291,11 +292,13 @@ (define-public po4a libxml2 libxslt ;; For tests. + docbook-sgml-4.1 docbook-xml-4.1.2 perl-test-pod texlive-tiny)) (inputs (list bash-minimal + opensp perl-gettext perl-pod-parser perl-sgmls