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. --- gnu/packages/glib.scm | 2 ++ .../patches/gobject-introspection-girepository.patch | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 gnu/packages/patches/gobject-introspection-girepository.patch diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8294c4d..39fc736 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -213,6 +213,8 @@ dynamic loading, and an object system.") (base32 "1xwm7wmr9r9wp6xljb3bckx3a4siybavaq39w46ly7gpskxfv8iv")) (patches (list (search-patch "gobject-introspection-cc.patch") + (search-patch + "gobject-introspection-girepository.patch") (search-patch "gobject-introspection-absolute-shlib-path.patch"))))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/gobject-introspection-girepository.patch b/gnu/packages/patches/gobject-introspection-girepository.patch new file mode 100644 index 0000000..5f1905f --- /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])); ++ } + + if (module == NULL) + { -- 1.8.4