From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qJbWCPv0DmUPbAAAauVa8A:P1 (envelope-from ) for ; Sat, 23 Sep 2023 16:23:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id qJbWCPv0DmUPbAAAauVa8A (envelope-from ) for ; Sat, 23 Sep 2023 16:23:55 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DD22944690 for ; Sat, 23 Sep 2023 16:23:54 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695479034; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=dJVEMdkfM6AJz95ITbX8s6+wnixGKGtZpAE/+gk/Bfk=; b=XIlXNiipQIE2iym3yRv9b8hwOjgGimnf34aTo1x2CCryIksd3eo2t6uaxsAakK59gcbSYo PL4hZCNFQ/V8UHmjcYtDCM/SpVavOLeQZkeiWa5/qBdgv9BB9sJtNVeczVcqtljkGB9Y46 kplxJLOpkvdO1bg8g8OdHVX6xx0q42OCBN74WVaGUG2ht8/OkULAzS6bDeju1BmrG1I/uW ETxsuB4z0LfeWDAnAsKmYKdeDJWiWNvAIt73tXPRpgis26C1k0fv7EJxXu9GGVfuMW0+8y kBF00YMxYEBYoYsmubFOBYP9jUHnhJNq8e5I0uyyS+bbt+oypT+0bSWzYQsXKQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695479034; a=rsa-sha256; cv=none; b=tFKSJA7QHNTm0L864r48TvnJmAE4S7J2OY2bKraYzBEjchxispjkLecm9H3CLmKSECuj9U m/0PBXSYMeXREwwz6Q/jMR5jxGe5aZrtvFT9AzzIC9pODVQ6j0Ok/yHfnXe3dlOujcTEap UFrM99zq58YIX6qLw2lbHT00U4Abl4UyT2RDopbqSumdjn7jmXFi8e62xMnzJ13g0B9dbi bT6dhmTaOKvsOP5aQzaO+nXUqqY830IoyRwD7RNZl798D7hGaWrrNKsn75R4iHuVojvjYw g6igw7L5KOXwxsfjVx8EbPApd2jNxovYEWJcTwhVPV5LR886M8Czbbe40h+mdg== 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.70 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: DD22944690 X-Spam-Score: -4.70 X-TUID: WvbUkWrDYEEm 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.") -- 2.41.0