From patchwork Sat Sep 23 14:19:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54203 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 47E9227BBE9; Sat, 23 Sep 2023 15:23:56 +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=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 B046427BBE2 for ; Sat, 23 Sep 2023 15:23:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk3X6-0007a5-EO; Sat, 23 Sep 2023 10:22:56 -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 1qk3X3-0007V5-FV for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:53 -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 1qk3X2-0003KH-CD for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3XD-000884-IK for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 14/62] 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: Sat, 23 Sep 2023 14:23:03 +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.169547895831110 (code B ref 65479); Sat, 23 Sep 2023 14:23:03 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:22:38 +0000 Received: from localhost ([127.0.0.1]:40254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3Wo-00085c-Dl for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:38 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:42620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3WE-00081R-9g for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:02 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 9E41C20DE8 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id D2E468009C; Sat, 23 Sep 2023 16:21:21 +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 k-qZzkNMAYKx; Sat, 23 Sep 2023 16:21:21 +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 529B58009D; Sat, 23 Sep 2023 16:21:20 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:19:49 +0100 Message-ID: <81881efffa61672124d5f79b9a19ca9145f0d5a0.1695478390.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 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 267a35e560..3ed0668fa3 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -601,7 +601,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 6aa5a22e67..ab4001e885 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -365,6 +365,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.")