From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gA5aHN5dJGVJEQAAauVa8A:P1 (envelope-from ) for ; Mon, 09 Oct 2023 22:09:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gA5aHN5dJGVJEQAAauVa8A (envelope-from ) for ; Mon, 09 Oct 2023 22:09:02 +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 616F5590A9 for ; Mon, 9 Oct 2023 22:09:02 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696882142; 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=CtPIbrpfRac4tyNGXiiC68IF5rUsycZbCzX0xDVO6NQ=; b=GpEiSXXXgnYyApYLsvIMuwzqIqGi1bj6A31uXDRV0utM2LRDoDTlu/kSv0w9c5TELb9Dvt 1HFgPL9BLiq+FCbGo0R1ZfYDs3zrOYB6QmjBhr86yi9IRysms8RPcbv4aauj4M6B1d4fx1 +IfrNXRUJGbhK808uV1WPk+K3bscTWtKzgJZfDl5GmmMybdZnDCEi1ZyMYqALUIFqrxV9Y XwY9i5V4xl1QFZ6yMpcBR8HH838/Cy5EzdmQvViLuLBhvCtc71VDMA0QZ3va1y8FXCh5SE 6NsDn/orqYOBK3VO0V5NpYV299uYAf0xiYQtFaHBTrkdp09M4CagDfkyh2u16A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696882142; a=rsa-sha256; cv=none; b=ouFNxV0gGSOATWMc7sheFUhOozpMUVjstghvmvpx4Z/sZQVFBA+FMQIUhp20QsB8y2S/wX SliQOeZw0oc9T+CuaPwtJgwOsrkt18W3nQi4hAZQyGT271rJiCe0v4Rp410odnvLZmtgfM phfAv0dWlBFvekS20q7vkIHum7OtwAUvU+4jreb2muIagT6U5gxlvBbL6IuLAEWlFdtWbO 6DZ819phx5KJDTRSg0Ydg5FFC1X6AMJA8iKYu3HMAQEeNSDO57tb3POhtNRDXhPBmjsFsP eMFDdI6SsR6x8yiKvsx7tmxf7nL7JO4xdDuXyC3UUTO+x+4HxChck9riScJqAg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwXd-0005pB-H4; Mon, 09 Oct 2023 16:07:49 -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 1qpwXa-0005nw-PM for guix-patches@gnu.org; Mon, 09 Oct 2023 16:07:46 -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 1qpwXa-0007sW-Gh for guix-patches@gnu.org; Mon, 09 Oct 2023 16:07:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwXv-0002Tx-8D for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 15/63] gnu: docbook2x: Set search-paths for XML and SGML catalogs. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:08:07 +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.16968820739329 (code B ref 65479); Mon, 09 Oct 2023 20:08:07 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:07:53 +0000 Received: from localhost ([127.0.0.1]:33277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwXh-0002QN-1j for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:07:53 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:47174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwXb-0002PO-Nc for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:07:48 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id BC080207FC for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 47F0D80099; Mon, 9 Oct 2023 22:07:22 +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 0ec6AGtaQitK; Mon, 9 Oct 2023 22:07:22 +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 54A07800A7; Mon, 9 Oct 2023 22:07:18 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:03 +0100 Message-ID: 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 616F5590A9 X-Spam-Score: -4.73 X-Migadu-Spam-Score: -4.73 X-Migadu-Scanner: mx1.migadu.com X-TUID: VDtD6/jLsJ7U According to the manpage, it has both XML and SGML catalog support through the XML_CATALOG_FILES (resp. SGML_CATALOG_FILES) environment variables through db2x_xsltproc. * gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Don't hardcode XML_CATALOG_FILES environmment variable. [native-search-paths]: Add %libxslt-search-paths. --- gnu/packages/docbook.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index b092be42db..6da168dd52 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -43,6 +43,7 @@ (define-module (gnu packages docbook) #:use-module (gnu packages xfig) #:use-module (gnu packages xml) #:use-module (guix gexp) + #:use-module (guix search-paths) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -911,14 +912,10 @@ (define-public docbook2x '("perl-xml-namespacesupport" "perl-xml-parser" "perl-xml-sax" - "perl-xml-sax-base"))) - (xml-catalog-files - (list (search-input-file - inputs "xml/dtd/docbook/catalog.xml")))) + "perl-xml-sax-base")))) (map (lambda (program) (wrap-program program - `("PERL5LIB" ":" prefix ,perl5lib) - `("XML_CATALOG_FILES" " " prefix ,xml-catalog-files))) + `("PERL5LIB" ":" prefix ,perl5lib))) programs)))) (add-after 'install 'sgml-check ;; This is not covered by 'make check'. @@ -951,6 +948,7 @@ (define-public docbook2x ;; For tests docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.4 groff-minimal libxml2)) + (native-search-paths %libxslt-search-paths) (home-page "https://docbook2x.sourceforge.net") (synopsis "Convert DocBook to man page and Texinfo format") (description -- 2.41.0