From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH] gnu: libpeas: Update to 1.12.1, add arguments and disable tests. Date: Thu, 22 Jan 2015 21:43:21 +0100 Message-ID: <877fwe1r86.fsf@gnu.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEOb9-0006bp-S4 for guix-devel@gnu.org; Thu, 22 Jan 2015 15:43:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEOb5-0008B4-Ru for guix-devel@gnu.org; Thu, 22 Jan 2015 15:43:27 -0500 Received: from hera.aquilenet.fr ([2a01:474::1]:51768) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEOb5-0008Ak-Hf for guix-devel@gnu.org; Thu, 22 Jan 2015 15:43:23 -0500 In-Reply-To: (Federico Beffa's message of "Wed, 21 Jan 2015 14:01:53 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Federico Beffa Cc: Guix-devel Federico Beffa skribis: > On Tue, Jan 20, 2015 at 6:52 PM, Federico Beffa 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 > 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 > 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-2= 0 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; > +=20 > ++ /* We expect an absolute directory name. If the library is > ++ not found, try with just the basename and the system > ++ dynamic library infrastructure. */ > + module =3D load_one_shared_library (shlibs[i]); > ++ if (module =3D=3D NULL && g_path_is_absolute (shlibs[i])) > ++ { > ++ module =3D 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=E2=80=99s 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=E2=80=99.