diff mbox series

[bug#65479,core-updates,v2,09/62] gnu: docbook2x: Fix sgml2xml-isoent and add test dependencies.

Message ID 6ae5c94fe1f102c7961dfc4f7c965cf8e6afcbdb.1695478390.git.mirai@makinata.eu
State New
Headers show
Series Docbook & XML/SGML improvements. | expand

Commit Message

Bruno Victal Sept. 23, 2023, 2:19 p.m. UTC 
* gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Add 'sgml-check
phase.
[inputs]: Add opensp.
[native-inputs]: Add docbook-xml-4.1.2, docbook-xml-4.2, docbook-xml-4.4,
tidy-html, groff-minimal and libxml2.
---
 gnu/packages/docbook.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 6a138dcb77..2d1c1f00ad 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -30,6 +30,7 @@  (define-module (gnu packages docbook)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages groff)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages tex)
@@ -37,6 +38,7 @@  (define-module (gnu packages docbook)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages web-browsers)
   #:use-module (gnu packages xfig)
   #:use-module (gnu packages xml)
@@ -924,6 +926,12 @@  (define-public docbook2x
                          `("PERL5LIB" ":" prefix ,perl5lib)
                          `("XML_CATALOG_FILES" " " prefix ,xml-catalog-files)))
                      programs))))
+          (add-after 'install 'sgml-check
+            ;; This is not covered by 'make check'.
+            ;; Test that 'sgml2xml-isoent' works.
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "make" "installcheck"))))
           (add-after 'install 'create-symlinks
             (lambda _
               ;; Create db2x_* symlinks to satisfy some configure scripts
@@ -935,6 +943,7 @@  (define-public docbook2x
                    '("docbook2man" "docbook2texi")))))))
     (inputs
      (list bash-minimal
+           opensp
            perl
            perl-xml-namespacesupport
            perl-xml-parser
@@ -944,7 +953,11 @@  (define-public docbook2x
            libxslt))
     (native-inputs
      (list autoconf automake libtool
-           docbook-xml-4.5))
+           tidy-html
+           ;; For tests
+           docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.4
+           docbook-xml-4.5
+           groff-minimal libxml2))
     (home-page "https://docbook2x.sourceforge.net")
     (synopsis "Convert DocBook to man page and Texinfo format")
     (description