--- Begin Message ---
Subject: |
[PATCH] gnu: asciidoc: Use local docbook-xml package. |
Date: |
Thu, 16 Mar 2017 14:17:54 -0400 |
From: Kei Kebreau <address@hidden>
* 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
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#26131: [PATCH] gnu: asciidoc: Use local docbook-xml package. |
Date: |
Thu, 16 Mar 2017 21:37:29 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) |
John Darrington <address@hidden> writes:
> On Thu, Mar 16, 2017 at 02:32:25PM -0400, Kei Kebreau wrote:
> address@hidden, "Kebreau <kei"@openmailbox.org writes:
>
> > From: Kei Kebreau <address@hidden>
> >
> > * 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
Description: PGP signature
--- End Message ---