From patchwork Mon Jun 19 23:47:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 51087 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 B4A3A27BBE2; Tue, 20 Jun 2023 01:03:08 +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 93FEF27BBE9 for ; Tue, 20 Jun 2023 01:03:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBOps-0005Ch-NC; Mon, 19 Jun 2023 20:03: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 1qBOpr-0005CQ-8P for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03: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 1qBOpq-00073L-WF for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBOpq-0000ij-RL for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63854] [PATCH core-updates v3 1/2] gnu: libxml2: Add SGML_CATALOG_FILES to native-search-path. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Jun 2023 00:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63854 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63854@debbugs.gnu.org Cc: gemmaro Received: via spool by 63854-submit@debbugs.gnu.org id=B63854.16872193762743 (code B ref 63854); Tue, 20 Jun 2023 00:03:02 +0000 Received: (at 63854) by debbugs.gnu.org; 20 Jun 2023 00:02:56 +0000 Received: from localhost ([127.0.0.1]:57582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBOpk-0000iA-0b for submit@debbugs.gnu.org; Mon, 19 Jun 2023 20:02:56 -0400 Received: from mail-pg1-f182.google.com ([209.85.215.182]:48401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBOpd-0000hW-OE for 63854@debbugs.gnu.org; Mon, 19 Jun 2023 20:02:50 -0400 Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-51b4ef5378bso3346567a12.1 for <63854@debbugs.gnu.org>; Mon, 19 Jun 2023 17:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687219364; x=1689811364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aVeGJ5XiCuC1kO2IiGHO09SPlVGdoxhBnv8eilRDdPA=; b=qXSc3bcFP0SkPwJVdYHYJ6BV2rrFJoNaF/B4UzurpRbnAF9kUWeABWJCzxbX3HNemd EU60QGmn+7GUQl/4shp0zwJkrxHfcUvAYxnYXqEFFRe6Z4qbVgr6Wem4ff56OKzl7GSh CZUvlHD1a5UO1vfipDH59Zu/ddSjGKrCPj4eVnocjCOuam+eDTodVzc3oOncWnujc51f +U0+xiTa5io710emzB+02laNdoSr807Oix93xjuMM5e7WYsQStKfn6JGBqNSmhbORaPP 0lPq0VGCZLoTvwKUd8F3EDADFNgewRUwwUgYYqJqrJH9g7DIMEo491JY1WEbwCSZcxb/ iLJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687219364; x=1689811364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aVeGJ5XiCuC1kO2IiGHO09SPlVGdoxhBnv8eilRDdPA=; b=NT0ZkNT4U075zgMVftXKwfXEs6DoL6c6Px1n4LFo38j35lgjWj0TjEHFl24gEfyzhe cf5FRICArC9nB6GjP8jWPLpPJhk6p9QH57yGjLjhaxis6+M2d8QhekxCqSWQ6LzljHLg tj5AVbAivFXqcCd73RmHtTkhI69p/TlQH+ul9nWbHycOoclbT2dM5E6LJhu5/CxQOhnD WaMJaLWp3c3bJM7eLDvSB2KOu5hhKw2RFkZiWfR0PjKDb7z8yvo9aXInY3y5jdd3mPq6 WZTp/d0jq2/Awfp/MZb+OrHPLPxPNc15Q/Ep+nCpXhRlvK99D4SHj09lFWiiriPF1Zd9 wgpA== X-Gm-Message-State: AC+VfDw/tZeUKuAT1qc9T8LsdMjr2Co1BTSk/fPIak+EQB+50ky+q0lP vNk+IUeZY2OpmrwhTGw66gDDyOwMdhnHSg== X-Google-Smtp-Source: ACHHUZ4RyNW8ae2wa7PEq/TZrf+vlLJzjGp+86ufC858L5qw8RFt7E/Rcb/TliCHpvZlE1nSLJoM2Q== X-Received: by 2002:a05:6a20:8e03:b0:121:3f8:2889 with SMTP id y3-20020a056a208e0300b0012103f82889mr8633663pzj.23.1687219363959; Mon, 19 Jun 2023 17:02:43 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id m14-20020a170902db0e00b001b3d6c86ffdsm337317plx.156.2023.06.19.17.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 17:02:43 -0700 (PDT) From: gemmaro Date: Tue, 20 Jun 2023 08:47:46 +0900 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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/xml.scm (libxml2)[native-search-paths]: Add SGML_CATALOG_FILES. --- gnu/packages/xml.scm | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 8d9974b825c..e376f0f09b2 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 David Larsson ;;; Copyright © 2021 Matthew James Kraai +;;; Copyright © 2023 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -222,14 +223,24 @@ (define-public libxml2 (inputs (list xz)) (propagated-inputs (list zlib)) ; libxml2.la says '-lz'. (native-inputs (list perl)) - ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xml' - ;; sub-directory of any given package. - (native-search-paths (list (search-path-specification - (variable "XML_CATALOG_FILES") - (separator " ") - (files '("xml")) - (file-pattern "^catalog\\.xml$") - (file-type 'regular)))) + (native-search-paths + (list + ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xml' + ;; sub-directory of any given package. + (search-path-specification + (variable "XML_CATALOG_FILES") + (separator " ") + (files '("xml")) + (file-pattern "^catalog\\.xml$") + (file-type 'regular)) + ;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files found + ;; under the 'sgml' sub-directory of any given package. + (search-path-specification + (variable "SGML_CATALOG_FILES") + (separator ":") + (files '("sgml")) + (file-pattern "^catalog$|^CATALOG$|^.*\\.cat$") + (file-type 'regular)))) (search-paths native-search-paths) (description "Libxml2 is the XML C parser and toolkit developed for the Gnome From patchwork Mon Jun 19 23:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 51088 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 3D0AC27BBEA; Tue, 20 Jun 2023 01:03:14 +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 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 6301F27BBE2 for ; Tue, 20 Jun 2023 01:03:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBOpt-0005DP-V6; Mon, 19 Jun 2023 20:03: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 1qBOpr-0005CY-Kl for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03: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 1qBOpr-00073T-Cd for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBOpr-0000iq-7t for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63854] [PATCH core-updates v3 2/2] gnu: po4a: Fix SGML tests. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Jun 2023 00:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63854 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63854@debbugs.gnu.org Cc: gemmaro Received: via spool by 63854-submit@debbugs.gnu.org id=B63854.16872193772750 (code B ref 63854); Tue, 20 Jun 2023 00:03:03 +0000 Received: (at 63854) by debbugs.gnu.org; 20 Jun 2023 00:02:57 +0000 Received: from localhost ([127.0.0.1]:57584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBOpk-0000iC-HZ for submit@debbugs.gnu.org; Mon, 19 Jun 2023 20:02:56 -0400 Received: from mail-pf1-f173.google.com ([209.85.210.173]:59577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBOpf-0000hZ-OQ for 63854@debbugs.gnu.org; Mon, 19 Jun 2023 20:02:52 -0400 Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-666ecf9a081so2889509b3a.2 for <63854@debbugs.gnu.org>; Mon, 19 Jun 2023 17:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687219366; x=1689811366; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MElwk3GLDmmueqzbfizW88qnCvEOhRR37CHOkjW55ts=; b=JRsFh5PX8nWeBV4eieLGIOmZkJfWo8h1A8rNR729s9WDju99U9F3zpG3ebtXQikfeu Gpgzv1cXahSjLzFhpmumJ25yJ5v2jEjryYCCPiCJ7jeH2yzNgdFS/BM6tdxRFWgHEhpU D/C1M6g6w/qMt1Ibd9GiVGYBd2ql2yT1yFxMuqHk7kL9UYHnyGAyS9mF4mg4/sRjDhgV 9IV9rYWK5Juc0tcHZzyh4ZIiTkDIK1zMsifOV3ScoC9WUira0K0VBAkYtegTejDJL9gT GbAzWN3Rm0gvzOr2EpD6DnksAfZrtd8Sh29MWUcfahjUmqQFg7C+dZddaswUtXC2v/iX tfyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687219366; x=1689811366; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MElwk3GLDmmueqzbfizW88qnCvEOhRR37CHOkjW55ts=; b=IRNAQcyQejuxN2Vgo52obKWrgTeF4+DDQU8Hw0fnZq32fzvuzWqYJy9JgwEUPhnjgV 4x6lXXeAaSbRbOHgZ1mfaPNyugLB8sCKVZkPnd/awuMTQZkkvnZ2baJQl4pIsj8bhLb3 rUOj5G+g2sPskMvah82swx9eEePcCHKl0cN6zCVe7UiZYKvlaiKO+yyaehijwrRW4hoF 5RZ/ttxVJgbiNjI9x6VTZh11aV3RWSi5Qqv0bbOH4I7sfFE9HP/iHawan33CbBYe+9VZ eEYkBlyVLdIMe5SPfgeiqA1NpnRlimJpHIfKK2SqscYQx9BzQnaAHGue7hDCEYxnS+zK SeHg== X-Gm-Message-State: AC+VfDy4+nPTkb6NngPbUVf6Iym7uNLcoBjye+Ta0eeNou0hMO/+eeiO wMeduaSnUJAakstxgaG2e8Vopd4Z9hJOBg== X-Google-Smtp-Source: ACHHUZ66DMEYDEMUewCdc15OIIaRU8NqZTzw6n0PIGsIQeC7EMoxEG/mNSNrLchdGoSc+QjEMVbN7g== X-Received: by 2002:a05:6a20:442a:b0:110:6146:1056 with SMTP id ce42-20020a056a20442a00b0011061461056mr17562400pzb.2.1687219365776; Mon, 19 Jun 2023 17:02:45 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id m14-20020a170902db0e00b001b3d6c86ffdsm337317plx.156.2023.06.19.17.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 17:02:45 -0700 (PDT) From: gemmaro Date: Tue, 20 Jun 2023 08:47:47 +0900 Message-Id: <7080ff0ecfe6817501ab3eb64d200158d17c595a.1687217685.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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/gettext.scm (po4a): Fix SGML tests. --- gnu/packages/gettext.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 114d8cf7afd..92bc506dd04 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2019 Miguel ;;; Copyright © 2020, 2023 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. @@ -278,23 +278,21 @@ (define-public po4a (for-each (lambda (file) (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")))))) + (find-files bin "\\.*$")))))))) (native-inputs (list gettext-minimal perl-module-build docbook-xsl - libxml2 + libxml2 ;for SGML_CATALOG_FILES 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