From patchwork Wed Aug 23 22:35:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53131 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 F0D8A27BBE9; Wed, 23 Aug 2023 23:38: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.9 required=5.0 tests=BAYES_00,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 6072527BBEA for ; Wed, 23 Aug 2023 23:38:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTS-000811-3h; Wed, 23 Aug 2023 18:37:14 -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 1qYwTJ-0007nY-Su for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:07 -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 1qYwTJ-0004wT-48 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTM-0004Bq-Nz for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 14/61] gnu: libxslt: Set search-paths for XML and SGML catalogs. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169283021515817 (code B ref 65479); Wed, 23 Aug 2023 22:37:08 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:36:55 +0000 Received: from localhost ([127.0.0.1]:35379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwT8-000465-MS for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:54 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:37360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSh-00042W-Ig for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:28 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 97A9020E7B for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 09FC480060; Thu, 24 Aug 2023 00:36:10 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id xIcOgWrCch4b; Thu, 24 Aug 2023 00:36:09 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 04A9680097; Thu, 24 Aug 2023 00:36:08 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:06 +0100 Message-Id: <9b7c69b6933edffbc1125c81d3a2e8b58dc9e17b.1692830149.git.mirai@makinata.eu> 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 According to xsltproc manpage it supports both XML_CATALOG_FILES and SGML_CATALOG_FILES for catalog lookup. * gnu/packages/xml.scm (libxslt)[native-search-paths]: Add SGML_CATALOG_FILES and XML_CATALOG_FILES. [search-paths]: Likewise. * gnu/packages/perl.scm (perl-app-xml-docbook-builder)[native-search-paths]: Refer to libxslt native-search-paths. --- gnu/packages/perl.scm | 2 +- gnu/packages/xml.scm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7f9b19b6ee..5995aa0346 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -602,7 +602,7 @@ (define-public perl-app-xml-docbook-builder (list perl-class-xsaccessor perl-test-trap)) (native-search-paths ;; xsltproc's search paths, to avoid propagating libxslt. - (list $XML_CATALOG_FILES)) + (package-native-search-paths libxslt)) (home-page "https://www.shlomifish.org/open-source/projects/docmake/") (synopsis "Translate DocBook/XML documentation into other file formats") (description diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ec3de82765..bbae6dd766 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -363,6 +363,9 @@ (define-public libxslt xz)) (native-inputs (list pkg-config)) + (native-search-paths + (list $SGML_CATALOG_FILES $XML_CATALOG_FILES)) + (search-paths native-search-paths) (description "Libxslt is an XSLT C library developed for the GNOME project. It is based on libxml for XML parsing, tree manipulation and XPath support.")