guix-commits
[Top][All Lists]
Advanced

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

44/44: gnu: libmodulemd: Remove fix-docbook-references phase.


From: guix-commits
Subject: 44/44: gnu: libmodulemd: Remove fix-docbook-references phase.
Date: Fri, 21 Apr 2023 00:48:27 -0400 (EDT)

apteryx pushed a commit to branch core-updates
in repository guix.

commit aee7fc2e41059e81050087deb0573b99ca868b95
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Apr 21 00:41:03 2023 -0400

    gnu: libmodulemd: Remove fix-docbook-references phase.
    
    * gnu/packages/rpm.scm (libmodulemd) [arguments]: Remove
    fix-docbook-references phase.
    [native-inputs]: Add libxml2.
---
 gnu/packages/rpm.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm
index 0b6cacadef..b7802e3ecd 100644
--- a/gnu/packages/rpm.scm
+++ b/gnu/packages/rpm.scm
@@ -105,14 +105,6 @@ applying deltarpms, compatible with the original deltarpm 
packages.")
                  (format #f "glib_docpath = '~a'~%"
                          (search-input-directory (or native-inputs inputs)
                                                  "share/gtk-doc/html"))))))
-          (add-after 'unpack 'fix-docbook-references
-            ;; gtk-doc doesn't seem to honor DocBook 4.1.2's docbook.cat's
-            ;; catalog file, even when adding it to XML_CATALOG_FILES.  Work
-            ;; around it by adjusting the DocBook references directly.
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "modulemd/modulemd-docs.xml"
-                (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";)
-                 (search-input-file inputs "xml/dtd/docbook/docbookx.dtd")))))
           (add-after 'install 'move-documentation
             (lambda* (#:key outputs #:allow-other-keys)
               (let ((dst (string-append #$output:doc "/share/gtk-doc")))
@@ -126,6 +118,7 @@ applying deltarpms, compatible with the original deltarpm 
packages.")
            gobject-introspection        ;for g-ir-scanner
            gtk-doc
            help2man
+           libxml2                      ;for XML_CATALOG_FILES
            pkg-config
            python))                     ;for 'site-packages' call
     (inputs



reply via email to

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