From patchwork Tue Mar 8 14:36:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37649 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 9BB7027BBEA; Tue, 8 Mar 2022 14:37:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 01D7A27BBE9 for ; Tue, 8 Mar 2022 14:37:12 +0000 (GMT) Received: from localhost ([::1]:34190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRaxb-00060d-5T for patchwork@mira.cbaines.net; Tue, 08 Mar 2022 09:37:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRaxS-0005zg-Op for guix-patches@gnu.org; Tue, 08 Mar 2022 09:37:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nRaxS-0005Nj-G5 for guix-patches@gnu.org; Tue, 08 Mar 2022 09:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nRaxS-0001rc-A6 for guix-patches@gnu.org; Tue, 08 Mar 2022 09:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54235] [PATCH v3 1/4] gnu: docbook-xml-4.1.2: Install an XML catalog file. References: <20220303135326.28867-1-maxim.cournoyer@gmail.com> In-Reply-To: <20220303135326.28867-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Mar 2022 14:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54235 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54235@debbugs.gnu.org Cc: maximedevos@telenet.be, Maxim Cournoyer Received: via spool by 54235-submit@debbugs.gnu.org id=B54235.16467501847070 (code B ref 54235); Tue, 08 Mar 2022 14:37:02 +0000 Received: (at 54235) by debbugs.gnu.org; 8 Mar 2022 14:36:24 +0000 Received: from localhost ([127.0.0.1]:55622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRawq-0001py-GE for submit@debbugs.gnu.org; Tue, 08 Mar 2022 09:36:24 -0500 Received: from mail-qv1-f52.google.com ([209.85.219.52]:36774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRawo-0001ph-8A for 54235@debbugs.gnu.org; Tue, 08 Mar 2022 09:36:23 -0500 Received: by mail-qv1-f52.google.com with SMTP id eq14so8805093qvb.3 for <54235@debbugs.gnu.org>; Tue, 08 Mar 2022 06:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P0iUHZcyzaGrE6mqI1mcLkmFPkpFJBn+Z4UC+oDsf6k=; b=AmjUJkJ7Hb3wUxjNLmpO54NmXTNLSdUnWJTwkR7wSrHr2WKYkTKGXe7U5H4Cnc/ai0 uVOiyCLoR3gTva88TZXRy5DRz9/R/fEoE793HMJGLK9sgIGXdOEtXGzMPorW/4snX6tY EQinYkNpdFKb0E6yg7hrl5EHds2IhSfPUGKQzP6PohVqJTzkt2cjEgj1tbDJjcAYgBQj jVl4bYbmXI7HMLnLhSVZrU3t27S2P/4gzVxJyZuhOppQ6Re2YKOYxxMbvJEEhwSLvsTu +cWgb+T1dO4v2zOqAcVZFkC0i+WXbXIjGw3biZH9rdL8LsT38++In3JVK0AmcqsHpj94 lmFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P0iUHZcyzaGrE6mqI1mcLkmFPkpFJBn+Z4UC+oDsf6k=; b=4p6bU5CEFfo64VeMhPd5uO0+gu0VS0OrJ9b6XaT3GznNbGnNOJxbgFmubeavPZNeGh bZPN5dwNjRhPYF4Ul92jZMERr1lYR5P1Zd03SyLOcf6r4zbYLTr9np4xHowjS9xI2y0k ulCXKdf6mdt+kpxEI8k4QCS2B29RHgkzl4XJ/rkg53eYSKi2p5L8vgr265iROyJ+CeD9 6nBMLZkuSCzsKC93IZIhMyX2tdlvIsgD8kIcim99RuhoxsMQ97cTsbemuUxny3IdciMt Vx6QmicqUzRrfeuyCvJWdo/SgMn5SPYUu60Nk57q7Ja/GLTPQtQcRd6lyFgPa4d+goE4 uCtw== X-Gm-Message-State: AOAM53218BqGvRPuA+Jj4TEMPSDkkYqdiijWFdbQ6O6V9NriInRN47Fj OB2A8N+uPQo+nFjlGgxmjtC3g9arWYY= X-Google-Smtp-Source: ABdhPJzY45kV49VadwfJavO/0BMlUaBaIZWv+zKtwrVZHdJcHggJ8BmRL/vbJq2BBdPR1/i0FRf8IQ== X-Received: by 2002:a05:6214:248b:b0:435:3fa1:5a82 with SMTP id gi11-20020a056214248b00b004353fa15a82mr12088674qvb.25.1646750176229; Tue, 08 Mar 2022 06:36:16 -0800 (PST) Received: from localhost.localdomain (dsl-205-151-56-54.b2b2c.ca. [205.151.56.54]) by smtp.gmail.com with ESMTPSA id e9-20020ac85989000000b002de2bfc8f94sm10338847qte.88.2022.03.08.06.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 06:36:15 -0800 (PST) From: Maxim Cournoyer Date: Tue, 8 Mar 2022 09:36:04 -0500 Message-Id: <20220308143607.7449-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-xml-4.1.2)[builder]: Generate a catalog file. [native-inputs]: Add libxml2. --- gnu/packages/docbook.scm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 6575bf2d75..0a8d2e2aed 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Mark H Weaver ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Andrew Whatson @@ -153,7 +153,8 @@ (define-public docbook-xml-4.2 "18hgwvmywh6a5jh38szjmg3hg2r4v5lb6r3ydc3rd8cp9wg61i5c")))))) (define-public docbook-xml-4.1.2 - (package (inherit docbook-xml) + (package + (inherit docbook-xml) (version "4.1.2") (source (origin (method url-fetch) @@ -167,13 +168,22 @@ (define-public docbook-xml-4.1.2 #:builder (begin (use-modules (guix build utils)) - (let ((source (assoc-ref %build-inputs "source")) - (unzip (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip")) - (dtd (string-append (assoc-ref %outputs "out") - "/xml/dtd/docbook"))) + (let* ((source (assoc-ref %build-inputs "source")) + (unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip")) + (xmlcatalog (string-append (assoc-ref %build-inputs "libxml2") + "/bin/xmlcatalog")) + (dtd (string-append (assoc-ref %outputs "out") + "/xml/dtd/docbook")) + (catalog.xml (string-append dtd "/catalog.xml"))) (mkdir-p dtd) - (invoke unzip source "-d" dtd))))))) + (invoke unzip source "-d" dtd) + ;; Create a minimal XML catalog, to use with libxml2 tools. + (invoke xmlcatalog "--noout" "--create" catalog.xml) + (invoke xmlcatalog "--noout" "--add" "public" + "-//OASIS//DTD DocBook XML V4.1.2//EN" + (string-append dtd "/docbookx.dtd") catalog.xml))))) + (native-inputs (list libxml2 unzip)))) (define-public docbook-xsl (package