public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gobject-introspection: 1.66.1 → 1.68.0 

Co-Authored-By: Maxine Aubrey <maxeaubrey@gmail.com>
This commit is contained in:
Jan Tojnar 2021-03-21 01:19:23 +00:00
parent 55e5bdc215
commit 58c6cbf78b
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
View File

@ -1,8 +1,10 @@
diff --git a/gir/cairo-1.0.gir.in b/gir/cairo-1.0.gir.in
index e4c9fb3d..3351b184 100644
--- a/gir/cairo-1.0.gir.in --- a/gir/cairo-1.0.gir.in
+++ b/gir/cairo-1.0.gir.in +++ b/gir/cairo-1.0.gir.in
@@ -5,7 +5,7 @@ @@ -6,7 +6,7 @@
xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
<package name="@CAIRO_GIR_PACKAGE@"/> <package name="@CAIRO_GIR_PACKAGE@"/>
<c:include name="cairo-gobject.h"/>
<namespace name="cairo" version="1.0" <namespace name="cairo" version="1.0"
- shared-library="@CAIRO_SHARED_LIBRARY@" - shared-library="@CAIRO_SHARED_LIBRARY@"
+ shared-library="@cairoLib@/@CAIRO_SHARED_LIBRARY@" + shared-library="@cairoLib@/@CAIRO_SHARED_LIBRARY@"

15
pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
View File

@ -40,7 +40,7 @@
def _get_option_parser(): def _get_option_parser():
parser = optparse.OptionParser('%prog [options] sources', parser = optparse.OptionParser('%prog [options] sources',
version='%prog ' + giscanner.__version__) version='%prog ' + giscanner.__version__)
@@ -205,6 +238,10 @@ match the namespace prefix.""") @@ -214,6 +247,10 @@ match the namespace prefix.""")
parser.add_option("", "--filelist", parser.add_option("", "--filelist",
action="store", dest="filelist", default=[], action="store", dest="filelist", default=[],
help="file containing headers and sources to be scanned") help="file containing headers and sources to be scanned")
@ -66,7 +66,7 @@
# This is a what we do for non-la files. We assume that we are on an # This is a what we do for non-la files. We assume that we are on an
# ELF-like system where ldd exists and the soname extracted with ldd is # ELF-like system where ldd exists and the soname extracted with ldd is
# a filename that can be opened with dlopen(). # a filename that can be opened with dlopen().
@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): @@ -108,7 +114,8 @@ def _resolve_non_libtool(options, binary, libraries):
output = output.decode("utf-8", "replace") output = output.decode("utf-8", "replace")
shlibs = resolve_from_ldd_output(libraries, output) shlibs = resolve_from_ldd_output(libraries, output)
@ -76,7 +76,7 @@
def sanitize_shlib_path(lib): def sanitize_shlib_path(lib):
@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): @@ -117,19 +124,18 @@ def sanitize_shlib_path(lib):
# In case we get relative paths on macOS (like @rpath) then we fall # In case we get relative paths on macOS (like @rpath) then we fall
# back to the basename as well: # back to the basename as well:
# https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
@ -101,7 +101,7 @@
if len(patterns) == 0: if len(patterns) == 0:
return [] return []
@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): @@ -141,8 +147,11 @@ def resolve_from_ldd_output(libraries, output):
if line.endswith(':'): if line.endswith(':'):
continue continue
for word in line.split(): for word in line.split():
@ -117,7 +117,7 @@
shlibs.append(m.group()) shlibs.append(m.group())
--- a/giscanner/utils.py --- a/giscanner/utils.py
+++ b/giscanner/utils.py +++ b/giscanner/utils.py
@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): @@ -113,16 +113,11 @@ def extract_libtool_shlib(la_file):
if dlname is None: if dlname is None:
return None return None
@ -129,8 +129,7 @@
- if libdir is None: - if libdir is None:
- return dlbasename - return dlbasename
- return libdir + '/' + dlbasename - return libdir + '/' + dlbasename
- # From the comments in extract_libtool(), older libtools had - # Older libtools had a path rather than the raw dlname
- # a path rather than the raw dlname
- return os.path.basename(dlname) - return os.path.basename(dlname)
+ dlbasename = os.path.basename(dlname) + dlbasename = os.path.basename(dlname)
+ libdir = _extract_libdir_field(la_file) + libdir = _extract_libdir_field(la_file)
@ -139,7 +138,7 @@
+ return libdir + '/' + dlbasename + return libdir + '/' + dlbasename
def extract_libtool(la_file): # Returns arguments for invoking libtool, if applicable, otherwise None
--- a/tests/scanner/test_shlibs.py --- a/tests/scanner/test_shlibs.py
+++ b/tests/scanner/test_shlibs.py +++ b/tests/scanner/test_shlibs.py
@@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path @@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path

4
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -26,7 +26,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gobject-introspection"; pname = "gobject-introspection";
version = "1.66.1"; version = "1.68.0";
# outputs TODO: share/gobject-introspection-1.0/tests is needed during build # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
# by pygobject3 (and maybe others), but it's only searched in $out # by pygobject3 (and maybe others), but it's only searched in $out
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"; sha256 = "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj";
}; };
patches = [ patches = [