[PATCH] Update glade.

[Ricardo Wurmus]

This makes it possible to build “gnunet-gtk” with the latest version of
GTK+.  I chose to disable the three tests, because they require an X
server with libGL support for software rendering.  I couldn’t get this
to work even after adding “xorg-server” and “mesa”, and starting Xvfb
before tests.

Patches for “gnunet-gtk” follow later (they also require changes to
our “gnunet” package).

~~ Ricardo

>From 48a7ac38ee0f5554c844a503d5ed232a5816eb07 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Thu, 14 Jan 2016 11:03:49 +0100
Subject: [PATCH] gnu: glade: Update to 3.18.5.

* gnu/packages/gnome.scm (glade): Update to 3.18.5.
[arguments]: Disable tests; add "fix-docbook" phase.
[inputs]: Replace "gtk+-2" with "gtk+".
[native-inputs]: Add "itstool", "libxslt", "docbook-xml", "docbook-xsl";
replace "python" with "python-2".
---
 gnu/packages/gnome.scm | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e88ee8d..ff08189 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -751,22 +751,42 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
 (define-public glade3
   (package
     (name "glade")
-    (version "3.8.5")
+    (version "3.18.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
                                   (version-major+minor version)  "/"
-                                  name "3-" version ".tar.xz"))
+                                  name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0d97df5pfkrh5670a98r3d3w8zlbh1jcax6cvq6j6a20vzjgd9aq"))))
+                "0lk4nvd5s8px9i0pbq7bncikgn2lpx7vjh787d3cvzpvwx3cxnzc"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; needs X, GL, and software rendering
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-docbook
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "man/Makefile.in"
+               
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl";)
+                (string-append (assoc-ref inputs "docbook-xsl")
+                               "/xml/xsl/docbook-xsl-"
+                               ,(package-version docbook-xsl)
+                               "/manpages/docbook.xsl")))
+             (setenv "XML_CATALOG_FILES"
+                     (string-append (assoc-ref inputs "docbook-xml")
+                                    "/xml/dtd/docbook/catalog.xml"))
+             #t)))))
     (inputs
-     `(("gtk+" ,gtk+-2)
+     `(("gtk+" ,gtk+)
        ("libxml2" ,libxml2)))
     (native-inputs
      `(("intltool" ,intltool)
-       ("python" ,python)
+       ("itstool" ,itstool)
+       ("libxslt" ,libxslt) ;for xsltproc
+       ("docbook-xml" ,docbook-xml-4.2)
+       ("docbook-xsl" ,docbook-xsl)
+       ("python" ,python-2)
        ("pkg-config" ,pkg-config)))
     (home-page "https://glade.gnome.org";)
     (synopsis "GTK+ rapid application development tool")
-- 
2.5.0