From patchwork Sat Sep 23 14:19:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54183 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 6251227BBE2; Sat, 23 Sep 2023 15:22:50 +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 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 3393B27BBE9 for ; Sat, 23 Sep 2023 15:22:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk3WC-0006xA-6k; Sat, 23 Sep 2023 10:22:00 -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 1qk3W8-0006vA-WC for guix-patches@gnu.org; Sat, 23 Sep 2023 10:21:57 -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 1qk3W8-00039S-O8 for guix-patches@gnu.org; Sat, 23 Sep 2023 10:21:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3WJ-000836-VL for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 20/62] 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: Sat, 23 Sep 2023 14:22: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.169547891830777 (code B ref 65479); Sat, 23 Sep 2023 14:22:07 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:21:58 +0000 Received: from localhost ([127.0.0.1]:40197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3W9-000808-FF for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:21:57 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:57978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3Vt-0007yc-Te for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:21:42 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id C9C1F20CFF for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id F37438009D; Sat, 23 Sep 2023 16:21:24 +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 Rv4x_W8BHSbI; Sat, 23 Sep 2023 16:21:24 +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 8C2A080098; Sat, 23 Sep 2023 16:21:23 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:19:55 +0100 Message-ID: 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 the manpage, it has both XML and SGML catalog support through the XML_CATALOG_FILES (resp. SGML_CATALOG_FILES) environment variables. * gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Don't hardcode XML_CATALOG_FILES environmment variable. [native-search-paths]: Add $XML_CATALOG_FILES and $SGML_CATALOG_FILES. --- 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 1b24c3522e..2f221866cc 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) @@ -1048,14 +1049,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'. @@ -1089,6 +1086,7 @@ (define-public docbook2x docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.4 docbook-xml-4.5 groff-minimal libxml2)) + (native-search-paths (list $XML_CATALOG_FILES $SGML_CATALOG_FILES)) (outputs '("out" "doc")) (home-page "https://docbook2x.sourceforge.net") (synopsis "Convert DocBook to man page and Texinfo format")