[PATCH 1/6] gnu: docbook-xsl update to 1.78.1

[PATCH 1/6] gnu: docbook-xsl update to 1.78.1

[John Darrington]

* gnu/packages/docbook.scm (docbook-xsl): Upgrade to version 1.78.1
---
 gnu/packages/docbook.scm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 29fa409..6d380ed 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -64,14 +64,14 @@ by no means limited to these applications.)  This package provides XML DTDs.")
 (define-public docbook-xsl
   (package
     (name "docbook-xsl")
-    (version "1.72.0")
+    (version "1.78.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/docbook/docbook-xsl-"
                                   version ".tar.bz2"))
               (sha256
                (base32
-                "1cnrfgqz8pc9wnlgqjch2338ad7jki6d4h6b2fhaxn1a2201df5k"))))
+                "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"))))
     (build-system trivial-build-system)
     (arguments
      `(#:builder (begin
-- 
1.7.10.4

[PATCH 2/6] gnu: Add docbook-xml version 4.3 and 4.4

[John Darrington]

* gnu/packages/docbook.scm (docbook-xml-4.3, docbook-xml-4.4): New variables.
---
 gnu/packages/docbook.scm |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 6d380ed..1a48d97 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -61,6 +61,28 @@ suited to books and papers about computer hardware and software (though it is
 by no means limited to these applications.)  This package provides XML DTDs.")
     (license (x11-style "" "See file headers."))))
 
+(define-public docbook-xml-4.4
+  (package (inherit docbook-xml)
+   (version "4.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.docbook.org/xml/" version
+                                  "/docbook-xml-" version ".zip"))
+              (sha256
+               (base32
+                "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82"))))))
+
+(define-public docbook-xml-4.3
+  (package (inherit docbook-xml)
+   (version "4.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.docbook.org/xml/" version
+                                  "/docbook-xml-" version ".zip"))
+              (sha256
+               (base32
+                "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"))))))
+
 (define-public docbook-xsl
   (package
     (name "docbook-xsl")
-- 
1.7.10.4

[PATCH 3/6] gnu: docbook-xml: Substite remote xml_catalog uris with local ones.

[John Darrington]

* gnu/packages/docbook.scm: substitute remote uri with local ones.
---
 gnu/packages/docbook.scm |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 1a48d97..431da7f 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -50,8 +50,12 @@
                           (dtd    (string-append out "/xml/dtd/docbook")))
                      (mkdir-p dtd)
                      (with-directory-excursion dtd
-                       (system* unzip source))))
-       #:modules ((guix build utils))))
+                       (system* unzip source))
+                     (substitute* (string-append out "/xml/dtd/docbook/catalog.xml")
+                       (("uri=\"") 
+                        (string-append 
+                         "uri=\"file://" dtd "/")))))
+                 #:modules ((guix build utils))))
     (native-inputs `(("unzip" ,unzip)))
     (home-page "http://docbook.org")
     (synopsis "DocBook XML DTDs for document authoring")
-- 
1.7.10.4

[PATCH 4/6] gnu: docbook-xsl write absolute file:// uris in catalogs instead of ./ relative ones

[John Darrington]

* gnu/packages/docbook.scm (docbook-xsl):  Replace ./ paths with file:// uris
---
 gnu/packages/docbook.scm |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index 431da7f..c689c9c 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -100,7 +100,7 @@ by no means limited to these applications.)  This package provides XML DTDs.")
                 "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"))))
     (build-system trivial-build-system)
     (arguments
-     `(#:builder (begin
+     `(#:builder (let ((name-version (string-append ,name "-" ,version)))
                    (use-modules (guix build utils))
 
                    (let* ((bzip2  (assoc-ref %build-inputs "bzip2"))
@@ -112,10 +112,13 @@ by no means limited to these applications.)  This package provides XML DTDs.")
                      (system* (string-append tar "/bin/tar") "xvf" source)
 
                      (mkdir-p xsl)
-                     (copy-recursively (string-append ,name "-" ,version)
-                                       (string-append xsl "/" ,name
-                                                      "-" ,version))))
-       #:modules ((guix build utils))))
+                     (copy-recursively name-version
+                                       (string-append xsl "/" name-version))
+
+                     (substitute* (string-append xsl "/" name-version "/catalog.xml")
+                       (("rewritePrefix=\"./") 
+                        (string-append "rewritePrefix=\"file://" xsl "/" name-version "/")))))
+                 #:modules ((guix build utils))))
     (native-inputs `(("bzip2" ,bzip2)
                      ("tar" ,tar)))
     (home-page "http://docbook.org")
-- 
1.7.10.4

[PATCH 5/6] gnu: Enable gnome-doc-utils tests

[John Darrington]

* gnu/packages/gnome (gnome-doc-utils): Set the XML_CATALOG_FILES variable and
  enable the tests.
---
 gnu/packages/gnome.scm |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6992116..3811fa6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -26,6 +26,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)  
+  #:use-module (gnu packages docbook)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gstreamer)
@@ -137,14 +138,24 @@ The gnome-about program helps find which version of GNOME is installed.")
        (base32
         "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (alist-cons-before
+        'check 'pre-check
+        (lambda* (#:key inputs #:allow-other-keys #:rest args)
+          ;; This is needed, because without it, xmlint etc tries
+          ;; to download docbookx.dtd from the net
+          (setenv "XML_CATALOG_FILES" 
+                  (string-append (assoc-ref inputs "docbook-xml") 
+                                 "/xml/dtd/docbook/catalog.xml")))
+        %standard-phases)))
     (native-inputs
      `(("intltool" ,intltool)
+       ("docbook-xml" ,docbook-xml-4.4)
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
        ("pkg-config" ,pkg-config)
        ("python-2" ,python-2)))
-    (arguments
-     `(#:tests? #f)) ; tries to load http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd
     (home-page "https://wiki.gnome.org/GnomeDocUtils")
     (synopsis
      "Documentation utilities for the Gnome project")
-- 
1.7.10.4

[PATCH 6/6] gnu: Tinyproxy: Cleanup xml dependencies

[John Darrington]

* gnu/packages/web.scm (tinyproxy): Use the xml_catalog from docbook instead of
  generating a temporary one.
---
 gnu/packages/web.scm |   28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 6e94953..24886f9 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -528,25 +528,15 @@ help you implement simple HTTP servers.")
        (alist-cons-before
         'build 'pre-build
         (lambda* (#:key inputs #:allow-other-keys #:rest args)
-          ;; This stuff is needed, because without it, xmlint etc tries
-          ;; to download docbookx.dtd and docbook.xsl from the net
-          (let ((build (assoc-ref %standard-phases 'build))
-                (docbook-xml (assoc-ref inputs "docbook-xml"))
-                (docbook-xsl (assoc-ref inputs "docbook-xsl"))
-                (our-catalog "/tmp/docbook-xml.xml"))
-            (setenv "XML_CATALOG_FILES" our-catalog)
-            (with-output-to-file our-catalog
-              (lambda ()
-                (display (string-append
-                          "<?xml version=\"1.0\"?>
-<!DOCTYPE catalog PUBLIC \"-//OASIS//DTD XML Catalogs V1.0//EN\"
-\"file:///usr/share/xml/schema/xml-core/catalog.dtd\">
-<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\">
-<system systemId=\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"
-uri=\"file://" docbook-xml  "/xml/dtd/docbook/docbookx.dtd\"/>
-<system systemId=\"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\"
-uri=\"file://" docbook-xsl  "/xml/xsl/docbook-xsl-1.72.0/manpages/docbook.xsl\"/>
-</catalog>\n"))))))
+          ;; Uncommenting the next two lines may assist in debugging
+          ;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v"))
+          ;; (setenv "XML_DEBUG_CATALOG" "1")
+
+          (setenv "XML_CATALOG_FILES" 
+                  (string-append
+                   (assoc-ref inputs "docbook-xsl") "/xml/xsl/docbook-xsl-1.78.1/catalog.xml"
+                   " "  ; This must be a space, not a : (contrary to the documentation)
+                   (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml")))
         %standard-phases)))
     ;; All of the below are used to generate the documentation
     ;; (Should they be propagated inputs of asciidoc ??)
-- 
1.7.10.4

Re: [PATCH 1/6] gnu: docbook-xsl update to 1.78.1

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/docbook.scm (docbook-xsl): Upgrade to version 1.78.1

OK to push.

Ludo’.

Re: [PATCH 2/6] gnu: Add docbook-xml version 4.3 and 4.4

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/docbook.scm (docbook-xml-4.3, docbook-xml-4.4): New variables.

OK!

Ludo’.

Re: [PATCH 3/6] gnu: docbook-xml: Substite remote xml_catalog uris with local ones.

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/docbook.scm: substitute remote uri with local ones.

Typo in subject line, and please add the variable name in the log.
OK to push with that, thanks!

Ludo’.

Re: [PATCH 4/6] gnu: docbook-xsl write absolute file:// uris in catalogs instead of ./ relative ones

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/docbook.scm (docbook-xsl):  Replace ./ paths with file:// uris

OK.

Re: [PATCH 5/6] gnu: Enable gnome-doc-utils tests

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/gnome (gnome-doc-utils): Set the XML_CATALOG_FILES variable and
>   enable the tests.

OK to push for now, but:

> +    (arguments
> +     `(#:phases
> +       (alist-cons-before
> +        'check 'pre-check
> +        (lambda* (#:key inputs #:allow-other-keys #:rest args)
> +          ;; This is needed, because without it, xmlint etc tries
> +          ;; to download docbookx.dtd from the net
> +          (setenv "XML_CATALOG_FILES" 
> +                  (string-append (assoc-ref inputs "docbook-xml") 
> +                                 "/xml/dtd/docbook/catalog.xml")))
> +        %standard-phases)))
>      (native-inputs
>       `(("intltool" ,intltool)
> +       ("docbook-xml" ,docbook-xml-4.4)

We can’t copy that around forever.

The problem is that ‘search-path-specification’ is meant for $PATH-like
variables that list directories, not files.

So I see two solutions:

  1. Patch libxml2 so that it honors a new variable, say
     $XML_CATALOG_DIRECTORIES, which would allow us to use
     ‘search-path-specification’.

  2. Augment support for search paths to allow file-based search paths.

(2) may be best in the long run, but it has ramifications in different
places.

Thoughts?

Ludo’.

Re: [PATCH 6/6] gnu: Tinyproxy: Cleanup xml dependencies

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/web.scm (tinyproxy): Use the xml_catalog from docbook instead of
>   generating a temporary one.

Limit lines to 80 chars please.

Also, “Use the XML catalog” no?

> +          (setenv "XML_CATALOG_FILES" 
> +                  (string-append
> +                   (assoc-ref inputs "docbook-xsl") "/xml/xsl/docbook-xsl-1.78.1/catalog.xml"
> +                   " "  ; This must be a space, not a : (contrary to the documentation)
> +                   (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml")))

Line length.

OK to push with this fixed.

Ludo’.

Re: [PATCH 6/6] gnu: Tinyproxy: Cleanup xml dependencies

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]

On Tue, Jul 15, 2014 at 11:00:31PM +0200, Ludovic Court??s wrote:
     John Darrington <jmd@gnu.org> skribis:
     
     > * gnu/packages/web.scm (tinyproxy): Use the xml_catalog from docbook instead of
     >   generating a temporary one.
     
     Limit lines to 80 chars please.

By my count, that is exactly 78 characters.
     
     Also, ???Use the XML catalog??? no?
     
     > +          (setenv "XML_CATALOG_FILES" 
     > +                  (string-append
     > +                   (assoc-ref inputs "docbook-xsl") "/xml/xsl/docbook-xsl-1.78.1/catalog.xml"
     > +                   " "  ; This must be a space, not a : (contrary to the documentation)
     > +                   (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml")))
     
     Line length.
     
     OK to push with this fixed.
     
     Ludo???.
     

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


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 5/6] gnu: Enable gnome-doc-utils tests

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 1718 bytes --]

On Tue, Jul 15, 2014 at 10:59:17PM +0200, Ludovic Court??s wrote:
     > +    (arguments
     > +     `(#:phases
     > +       (alist-cons-before
     > +        'check 'pre-check
     > +        (lambda* (#:key inputs #:allow-other-keys #:rest args)
     > +          ;; This is needed, because without it, xmlint etc tries
     > +          ;; to download docbookx.dtd from the net
     > +          (setenv "XML_CATALOG_FILES" 
     > +                  (string-append (assoc-ref inputs "docbook-xml") 
     > +                                 "/xml/dtd/docbook/catalog.xml")))
     > +        %standard-phases)))
     >      (native-inputs
     >       `(("intltool" ,intltool)
     > +       ("docbook-xml" ,docbook-xml-4.4)
     
     We can???t copy that around forever.
     
     The problem is that ???search-path-specification??? is meant for $PATH-like
     variables that list directories, not files.

That occurred to me too.  But what problems does it actually cause?
     
     So I see two solutions:
     
       1. Patch libxml2 so that it honors a new variable, say
          $XML_CATALOG_DIRECTORIES, which would allow us to use
          ???search-path-specification???.
     
       2. Augment support for search paths to allow file-based search paths.
     
     (2) may be best in the long run, but it has ramifications in different
     places.
     

(1) seems like a good idea only if upstream can be persuaded to adopt it.

What are the ramifications of (2) ?


     

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


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 5/6] gnu: Enable gnome-doc-utils tests

[Ludovic Courtès]

John Darrington <john@darrington.wattle.id.au> skribis:

> On Tue, Jul 15, 2014 at 10:59:17PM +0200, Ludovic Court??s wrote:

[...]

>      The problem is that ???search-path-specification??? is meant for $PATH-like
>      variables that list directories, not files.
>
> That occurred to me too.  But what problems does it actually cause?

That we can’t use it for $XML_CATALOG_FILES.

>      So I see two solutions:
>      
>        1. Patch libxml2 so that it honors a new variable, say
>           $XML_CATALOG_DIRECTORIES, which would allow us to use
>           ???search-path-specification???.
>      
>        2. Augment support for search paths to allow file-based search paths.
>      
>      (2) may be best in the long run, but it has ramifications in different
>      places.
>      
>
> (1) seems like a good idea only if upstream can be persuaded to adopt it.

Which is unlikely, given that it’s redundant with $XML_CATALOG_FILES.

> What are the ramifications of (2) ?

There are changes in the build tools, for instance ‘search-path-as-list’
(used by ‘set-path-environment-variable’, used in gnu-build-system.scm)
expects directories, not files.  And all this calls things
‘directories’.

This is a change we could schedule for the next core-updates.

WDYT?

Ludo’.

Re: [PATCH 5/6] gnu: Enable gnome-doc-utils tests

[John Darrington]

On Wed, Jul 16, 2014 at 11:23:12AM +0200, Ludovic Court??s wrote:
     John Darrington <john@darrington.wattle.id.au> skribis:
     
     > On Tue, Jul 15, 2014 at 10:59:17PM +0200, Ludovic Court??s wrote:
     
     [...]
     
     >      The problem is that ???search-path-specification??? is meant for $PATH-like
     >      variables that list directories, not files.
     >
     > That occurred to me too.  But what problems does it actually cause?
     
     That we can???t use it for $XML_CATALOG_FILES.
     
     >      So I see two solutions:
     >      
     >        1. Patch libxml2 so that it honors a new variable, say
     >           $XML_CATALOG_DIRECTORIES, which would allow us to use
     >           ???search-path-specification???.
     >      
     >        2. Augment support for search paths to allow file-based search paths.
     >      
     >      (2) may be best in the long run, but it has ramifications in different
     >      places.
     >      
     >
     > (1) seems like a good idea only if upstream can be persuaded to adopt it.
     
     Which is unlikely, given that it???s redundant with $XML_CATALOG_FILES.
     
     > What are the ramifications of (2) ?
     
     There are changes in the build tools, for instance ???search-path-as-list???
     (used by ???set-path-environment-variable???, used in gnu-build-system.scm)
     expects directories, not files.  And all this calls things
     ???directories???.
     
     This is a change we could schedule for the next core-updates.

This sounds like it is the most sensible solution. 

J'
-- 
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.