Re: [PATCH] gnu: libpeas: Update to 1.12.1, add arguments and disable tests.

[Ludovic Courtès]

Federico Beffa <address@hidden> skribis:

> On Tue, Jan 20, 2015 at 6:52 PM, Federico Beffa <address@hidden> wrote:
>> Please find attached a patch for libpeas.
>>
>> This package, up to now, is the only one experiencing some
>> side-effects from the gobject-introspection patch that we adopted from
>> nix and which installs the full path name of shared libraries in
>> .typelib and .gir files.
>
> I find the above side-effect disturbing. For this reason I would like
> to propose an additional patch to 'gobject-introspection'. When
> 'gobject-introspection' consults a .typelib file (due to the patch we
> introduced earlier) it will find a reference to a shared library which
> includes the absolute path. With the new patch, if the library is not
> found at the absolute path, then it discards the path and tries to
> look for the library using the OS dynamic library loading
> infrastructure (which is the normal behavior of
> 'gobject-introspection').

I see, that makes sense indeed.

> With this change 'libpeas' (and all its dependencies) passes all tests.

Perfect!

> From 58d32305b609eccf54de620398a54457af0af0c5 Mon Sep 17 00:00:00 2001
> From: Federico Beffa <address@hidden>
> Date: Tue, 20 Jan 2015 18:43:55 +0100
> Subject: [PATCH 1/2] gnu: libpeas: Update to 1.12.1, add 'pre-build phase.
>
> * gnu/packages/gnome.scm (libpeas): Update to version 1.12.1 and add
>   'pre-build phase.

OK.

> From b90d70f312e9c298232d76f29099002f359f4468 Mon Sep 17 00:00:00 2001
> From: Federico Beffa <address@hidden>
> Date: Wed, 21 Jan 2015 13:46:52 +0100
> Subject: [PATCH 2/2] gnu: gobject-introspection: Add patch.
>
> * gnu/packages/glib.scm (gobject-introspection): Add patch
>   gobject-introspection-girepository.patch.

[...]

> --- /dev/null
> +++ b/gnu/packages/patches/gobject-introspection-girepository.patch
> @@ -0,0 +1,17 @@
> +--- gobject-introspection-1.42.0/girepository/gitypelib.c.orig       
> 2015-01-20 20:37:43.706684642 +0100
> ++++ gobject-introspection-1.42.0/girepository/gitypelib.c    2015-01-21 
> 09:19:40.927751124 +0100
> +@@ -2296,7 +2296,14 @@
> +         {
> +           GModule *module;
> + 
> ++          /* We expect an absolute directory name.  If the library is
> ++             not found, try with just the basename and the system
> ++             dynamic library infrastructure. */
> +           module = load_one_shared_library (shlibs[i]);
> ++          if (module == NULL && g_path_is_absolute (shlibs[i]))
> ++            {
> ++              module = load_one_shared_library (g_basename(shlibs[i]));

Please explain at the top of the paragraph that libgobject-introspection
normally looks for library in the dynamic linker’s search path, and that
because we use absolute file names in gir files, we need this patch to
get closer to the initial behavior.

OK to push with this change.

Thank you!

Ludo’.