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

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 17 Mar 2017 01:38:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
26131: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=26131
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#26131: [PATCH] gnu: asciidoc: Use local docbook-xml package.
From: Kei Kebreau <[email-masked]>
To: John Darrington <[email-masked]>
Cc: [email-masked]
Date: Thu, 16 Mar 2017 21:37:29 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

John Darrington <[email-masked]> writes:

> 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).

Alright. Pushed to master.

Subject: [PATCH] gnu: asciidoc: Use local docbook-xml package.
From: [email-masked], "Kebreau <kei"@openmailbox.org
To: [email-masked]
Cc: Kei Kebreau <[email-masked]>
Date: Thu, 16 Mar 2017 14:17:54 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

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)))
-- 
2.12.0