Subject: bug#26131: [PATCH] gnu: asciidoc: Use local docbook-xml package.

From: John Darrington <[email-masked]>
Date: Thu, 16 Mar 2017 19:38:13 +0100

On Thu, Mar 16, 2017 at 02:32:25PM -0400, Kei Kebreau wrote:
     [email-masked], "Kebreau <kei"@openmailbox.org writes:
     
     > From: Kei Kebreau <[email-masked]>
     >
     > * gnu/packages/documentation.scm (asciidoc)[inputs]: Add docbook-xml.
     > [arguments]: Add 'make-local-docbook-xml' phase.
     > ---
     >  gnu/packages/documentation.scm | 9 +++++++++
     >  1 file changed, 9 insertions(+)
     >
     > diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
     > index 94e979c88..8b943788a 100644
     > --- a/gnu/packages/documentation.scm
     > +++ b/gnu/packages/documentation.scm
     > @@ -83,8 +83,17 @@ release/xsl/current")
     >                             (string-append (assoc-ref inputs "docbook-xsl")
     >                                            "/xml/xsl/docbook-xsl-"
     >                                            ,(package-version docbook-xsl)))))
     > +                       #t))
     > +         ;; Do the same for docbook-xml.
     > +         (add-before 'install 'make-local-docbook-xml
     > +                     (lambda* (#:key inputs #:allow-other-keys)
     > +                       (substitute* "docbook45.conf"
     > +                         (("http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd")
     > +                          (string-append (assoc-ref inputs "docbook-xml")
     > +                                         "/xml/dtd/docbook/docbookx.dtd")))
     >                         #t)))))
     >      (inputs `(("python" ,python-2)
     > +              ("docbook-xml" ,docbook-xml)
     >                ("docbook-xsl" ,docbook-xsl)
     >                ("libxml2" ,libxml2)
     >                ("libxslt" ,libxslt)))
     
     This patch fixes some offline validation issues with the docbookx.dtd
     file, but I still can't remove all the docbook- and libxml2-related
     things from all packages that use them for building documentation (for
     example, perf in gnu/packages/linux.scm).

LGTM (assuming it works).

-- 
Avoid eavesdropping.  Send strong encrypted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.