--- a/girepository/gitypelib.c.orig
+++ b/girepository/gitypelib.c
@@ -2296,7 +2296,22 @@ _g_typelib_do_dlopen (GITypelib *typelib)
{
GModule *module;
+ /* 'gobject-introspection' doesn't store the path of shared
+ libraries into '.typelib' and '.gir' files. Shared
+ libraries are searched for in the dynamic linker search
+ path. In Guix we patch 'gobject-introspection' such that
+ it stores the absolute path of shared libraries in
+ '.typelib' and '.gir' files. Here, in order to minimize
+ side effects, we make sure that if the library is not
+ found at the indicated path location, we try with just
+ the basename and the system dynamic library
+ infrastructure, as per default behaviour of the
+ library. */
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]));
+ }
if (module == NULL)
{
d=d67721ba9d817ee070e9a51ae5af292b33b2b48e'>refslogtreecommitdiff
|
Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
* doc/local.mk (info_TEXINFOS): Add guix.ru.texi.
(TRANSLATED_INFO): Add {guix,contributing}.ru.texi.
* po/doc/local.mk (DOC_PO_FILES): Add guix-manual.ru.po.
* po/doc/guix-manual.ru.po: New file.
|