Re: [PATCH] Update glade.

[Ricardo Wurmus <rekado@elephly.net>]

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