mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-16 20:10:39 +02:00
gnu: gobject-introspection: Update to 1.42.0 and add new patch.
* gnu/packages/glib.scm (gobject-introspection): Update to version 1.42.0. Add patch 'gobject-introspection-absolute-shlib-path.patch' provided by Luca Bruno <lucabru@src.gnome.org> for Nix.
This commit is contained in:
parent
561fb6c31f
commit
2474b81d96
2 changed files with 42 additions and 8 deletions
|
@ -0,0 +1,30 @@
|
|||
# Names of libraries included in typelib files are opened by dlopen. Here we
|
||||
# add the full path.
|
||||
#
|
||||
# This patch was provided by Luca Bruno <lucabru@src.gnome.org> for
|
||||
# 'gobject-introspection' 1.40.0 in Nix.
|
||||
--- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200
|
||||
+++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200
|
||||
@@ -110,17 +110,11 @@
|
||||
if dlname is None:
|
||||
return None
|
||||
|
||||
- # Darwin uses absolute paths where possible; since the libtool files never
|
||||
- # contain absolute paths, use the libdir field
|
||||
- if platform.system() == 'Darwin':
|
||||
- dlbasename = os.path.basename(dlname)
|
||||
- libdir = _extract_libdir_field(la_file)
|
||||
- if libdir is None:
|
||||
- return dlbasename
|
||||
- return libdir + '/' + dlbasename
|
||||
- # From the comments in extract_libtool(), older libtools had
|
||||
- # a path rather than the raw dlname
|
||||
- return os.path.basename(dlname)
|
||||
+ dlbasename = os.path.basename(dlname)
|
||||
+ libdir = _extract_libdir_field(la_file)
|
||||
+ if libdir is None:
|
||||
+ return dlbasename
|
||||
+ return libdir + '/' + dlbasename
|
||||
|
||||
|
||||
def extract_libtool(la_file):
|
Loading…
Add table
Add a link
Reference in a new issue