guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#65479] [PATCH core-updates 24/61] gnu: docbook2x: Drop docbook-xml


From: Bruno Victal
Subject: [bug#65479] [PATCH core-updates 24/61] gnu: docbook2x: Drop docbook-xml workarounds.
Date: Wed, 23 Aug 2023 23:35:16 +0100

* gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Drop
'patch-sources.
[native-inputs]: Remove docbook-xml-4.5.
---
 gnu/packages/docbook.scm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 2f221866cc..e3de6bc00a 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -1013,18 +1013,6 @@ (define-public docbook2x
      (list
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'configure 'patch-sources
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Patch all the tests use DocBook 4.5
-              (substitute* (find-files "test" "\\.xml$")
-                (("\"-//OASIS//DTD DocBook XML V4\\..+//EN\"")
-                 "\"-//OASIS//DTD DocBook XML V4.5//EN\"")
-                
(("\"http://www\\.oasis-open\\.org/docbook/xml/4\\..+/docbookx.dtd\"";)
-                 "\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"";))
-              ;; Set XML catalogs for tests to pass
-              (setenv "XML_CATALOG_FILES"
-                      (string-append (assoc-ref inputs "docbook-xml")
-                                     "/xml/dtd/docbook/catalog.xml"))))
           (add-after 'unpack 'autoreconf
             (lambda _
               (invoke "autoreconf" "-vif")))
@@ -1084,7 +1072,6 @@ (define-public docbook2x
            tidy-html
            ;; For tests
            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"))
-- 
2.40.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]