[PATCH] Update glade.

[PATCH] Update glade.

[Ricardo Wurmus]

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

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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-glade-Update-to-3.18.5.patch --]
[-- Type: text/x-patch, Size: 2765 bytes --]

From 48a7ac38ee0f5554c844a503d5ed232a5816eb07 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
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

Re: [PATCH] Update glade.

[Efraim Flashner]

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

On Thu, 14 Jan 2016 11:08:08 +0100
Ricardo Wurmus <rekado@elephly.net> wrote:

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

I see that in the inputs you've changed gtk+ from 2 to 3. `guix refresh -l
glade` doesn't show any programs that depend on glade currently, so if
something needs a gtk+-2 version later they could add back the 3.8 version.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] Update glade.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

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

OK.

> From 48a7ac38ee0f5554c844a503d5ed232a5816eb07 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> 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".

[...]

> +         (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"))

I’m surprised that this is needed: since libxml2 is an input, and since
libxml2 defines XML_CATALOG_FILES as its search path, XML_CATALOG_FILES
should automatically be set, no?

Otherwise LGTM, thanks!

I agree with Efraim that switching to GTK+ 3.x is good idea.

Ludo’.

Re: [PATCH] Update glade.

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> 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.
>
> OK.
>
>> From 48a7ac38ee0f5554c844a503d5ed232a5816eb07 Mon Sep 17 00:00:00 2001
>> From: Ricardo Wurmus <rekado@elephly.net>
>> 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".
>
> [...]
>
>> +         (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"))
>
> I’m surprised that this is needed: since libxml2 is an input, and since
> libxml2 defines XML_CATALOG_FILES as its search path, XML_CATALOG_FILES
> should automatically be set, no?

Oh, you are right.  I just rebuilt it without that setenv part and it
does work fine.

I’ll push with that change.  Thanks for the review!

~~ Ricardo