guix-patches
[Top][All Lists]
Advanced

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

[bug#65479] [PATCH core-updates v3 53/63] gnu: git: Drop docbook workaro


From: Bruno Victal
Subject: [bug#65479] [PATCH core-updates v3 53/63] gnu: git: Drop docbook workarounds.
Date: Mon, 9 Oct 2023 21:06:41 +0100

* gnu/packages/version-control.scm (git)[arguments]<#:phases>: Drop
docbook-xsl related substitution.
[native-inputs]: Add docbook-xml-4.5.
---
 gnu/packages/version-control.scm | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cc6d9745a0..ae1dc3ca86 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -540,20 +540,6 @@ (define-public git
             (add-after 'build 'build-subtree
               (lambda* (#:key native-inputs inputs #:allow-other-keys)
                 (with-directory-excursion "contrib/subtree"
-                  (substitute* "Makefile"
-                    ;; Apparently `xmlto' does not bother to looks up the
-                    ;; stylesheets specified in the XML, unlike the above
-                    ;; substitution.  Instead it uses a hard-coded URL.  Work
-                    ;; around it here, but if this is common perhaps we should
-                    ;; hardcode this path in xmlto itself.
-                    (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)")
-                     (string-append "$(XMLTO) -x "
-                                    (search-input-directory
-                                     (or native-inputs inputs)
-                                     (string-append
-                                      "xml/xsl/docbook-xsl-"
-                                      #$(package-version docbook-xsl)))
-                                    "/manpages/docbook.xsl -m 
$(MANPAGE_XSL)")))
                   (invoke "make")
                   (invoke "make" "install")
                   (invoke "make" "install-doc")
@@ -706,6 +692,7 @@ (define-public git
        ;; For subtree documentation.
        (append asciidoc
                docbook2x
+               docbook-xml-4.5
                docbook-xsl
                libxslt
                pkg-config
-- 
2.41.0






reply via email to

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