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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26131 in the body.
You can then email your comments to 26131 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

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

From: Kei Kebreau <kei <at> openmailbox.org>

* 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

Message #8 received at 26131 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: "Kei Kebreau" <kei <at> openmailbox.org>
Cc: 26131 <at> debbugs.gnu.org
Subject: Re: bug#26131: [PATCH] gnu: asciidoc: Use local docbook-xml package.
Date: Thu, 16 Mar 2017 14:32:25 -0400

[Message part 1 (text/plain, inline)]

Kei <at> openmailbox.org, "Kebreau <kei"@openmailbox.org writes:

> From: Kei Kebreau <kei <at> openmailbox.org>
>
> * 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).

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 26131 <at> debbugs.gnu.org (full text, mbox):

From: John Darrington <john <at> darrington.wattle.id.au>
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: 26131 <at> debbugs.gnu.org
Subject: Re: bug#26131: [PATCH] gnu: asciidoc: Use local docbook-xml package.
Date: Thu, 16 Mar 2017 19:38:13 +0100

[Message part 1 (text/plain, inline)]

On Thu, Mar 16, 2017 at 02:32:25PM -0400, Kei Kebreau wrote:
     Kei <at> openmailbox.org, "Kebreau <kei"@openmailbox.org writes:
     
     > From: Kei Kebreau <kei <at> openmailbox.org>
     >
     > * 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.

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 26131-done <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: John Darrington <john <at> darrington.wattle.id.au>
Cc: 26131-done <at> debbugs.gnu.org
Subject: Re: bug#26131: [PATCH] gnu: asciidoc: Use local docbook-xml package.
Date: Thu, 16 Mar 2017 21:37:29 -0400

[Message part 1 (text/plain, inline)]

John Darrington <john <at> darrington.wattle.id.au> writes:

> On Thu, Mar 16, 2017 at 02:32:25PM -0400, Kei Kebreau wrote:
>      Kei <at> openmailbox.org, "Kebreau <kei"@openmailbox.org writes:
>      
>      > From: Kei Kebreau <kei <at> openmailbox.org>
>      >
>      > * 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.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.