From 387b7bcdbcbdd873a9352f4f36d56296133d9861 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:06:12 -0400 Subject: [PATCH 15/16] gnu: gobject-introspection: Update to 1.64.1. * gnu/packages/glib.scm (gobject-introspection) [version]: Update to 1.64.1. [source][sha256]: Modify base32. [patches]: Remove gobject-introspection-absolute-shlib-path.patch and gobject-introspection-cc.patch. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['do-not-use-/usr/bin/env]: Remove phase. [native-inputs]: Add bison and flex. [inputs]: Remove bison, flex and zlib. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Delete file. * gnu/packages/patches/gobject-introspection-cc.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/glib.scm | 30 ++-- ...ct-introspection-absolute-shlib-path.patch | 166 ------------------ .../patches/gobject-introspection-cc.patch | 14 -- 4 files changed, 10 insertions(+), 202 deletions(-) delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch delete mode 100644 gnu/packages/patches/gobject-introspection-cc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2fc47ca2ec..ae2064b5fa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1075,8 +1075,6 @@ dist_patch_DATA = \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-cross.patch \ - %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ - %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 549145e799..fa43bc06a8 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -331,7 +331,7 @@ threads, dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.62.0") + (version "1.64.1") (source (origin (method url-fetch) @@ -340,33 +340,23 @@ threads, dynamic loading, and an object system.") "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")) (patches (search-patches - "gobject-introspection-cc.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path.patch")))) + "gobject-introspection-girepository.patch")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-use-/usr/bin/env - (lambda _ - (substitute* "tools/g-ir-tool-template.in" - (("#!@PYTHON_CMD@") - (string-append "#!" (which "python3")))) - #t))))) + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) - ("python" ,python-wrapper) - ("zlib" ,zlib))) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("python" ,python-wrapper))) (propagated-inputs - `(("libffi" ,libffi))) + `(("glib" ,glib) + ("libffi" ,libffi))) (native-search-paths (list (search-path-specification diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch deleted file mode 100644 index 956fa617c3..0000000000 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ /dev/null @@ -1,166 +0,0 @@ -# Names of libraries included in typelib files are opened by dlopen. Here we -# add the full path. -# -# This patch was provided by Luca Bruno for -# 'gobject-introspection' 1.40.0 in Nix. -# -# It has since been updated to work with newer versions of -# gobject-introspection. ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -95,6 +95,39 @@ def get_windows_option_group(parser): - return group - - -+def _get_default_fallback_libpath(): -+ # Newer multiple-output-optimized stdenv has an environment variable -+ # $outputLib which in turn specifies another variable which then is used as -+ # the destination for the library contents (${!outputLib}/lib). -+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None -+ if store_path is None: -+ outputs = os.environ.get("outputs", "out").split() -+ if "lib" in outputs: -+ # For multiple output derivations let's try whether there is a $lib -+ # environment variable and use that as the base store path. -+ store_path = os.environ.get("lib") -+ elif "out" in outputs: -+ # Otherwise we have a single output derivation, so the libraries -+ # most certainly will end up in "$out/lib". -+ store_path = os.environ.get("out") -+ -+ if store_path is not None: -+ # Even if we have a $lib as output, there still should be a $lib/lib -+ # directory. -+ return os.path.join(store_path, 'lib') -+ else: -+ # If we haven't found a possible scenario, let's return an empty string -+ # so that the shared library won't be prepended with a path. -+ # -+ # Note that this doesn't mean that all hope is lost, because after all -+ # we can still use --fallback-library-path to set one. -+ # -+ # Also, we're not returning None, because that would make it very -+ # difficult to disable adding fallback paths altogether using something -+ # like: --fallback-library-path="" -+ return "" -+ -+ - def _get_option_parser(): - parser = optparse.OptionParser('%prog [options] sources', - version='%prog ' + giscanner.__version__) -@@ -205,6 +238,10 @@ match the namespace prefix.""") - parser.add_option("", "--filelist", - action="store", dest="filelist", default=[], - help="file containing headers and sources to be scanned") -+ parser.add_option("", "--fallback-library-path", -+ action="store", dest="fallback_libpath", -+ default=_get_default_fallback_libpath(), -+ help="Path to prepend to unknown shared libraries") - - group = get_preprocessor_option_group(parser) - parser.add_option_group(group) ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): - $""" % re.escape(library_name), re.VERBOSE) - - -+def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape( -+ os.environ.get("NIX_STORE", default="/gnu/store") -+ ) -+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' -+ return re.compile(pattern % (store_dir, re.escape(library_name))) -+ -+ - # 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 - # a filename that can be opened with dlopen(). -@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): - output = output.decode("utf-8", "replace") - - shlibs = resolve_from_ldd_output(libraries, output) -- return list(map(sanitize_shlib_path, shlibs)) -+ fallback_libpath = options.fallback_libpath or ""; -+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) - - - def sanitize_shlib_path(lib): -@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): - # In case we get relative paths on macOS (like @rpath) then we fall - # back to the basename as well: - # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 -- if sys.platform == "darwin": -- if not os.path.isabs(lib): -- return os.path.basename(lib) -- return lib -- else: -+ -+ # Always use absolute paths if available -+ if not os.path.isabs(lib): - return os.path.basename(lib) -+ return lib - - - def resolve_from_ldd_output(libraries, output): - patterns = {} - for library in libraries: - if not os.path.isfile(library): -- patterns[library] = _ldd_library_pattern(library) -+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) - if len(patterns) == 0: - return [] - -@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): - if line.endswith(':'): - continue - for word in line.split(): -- for library, pattern in patterns.items(): -- m = pattern.match(word) -+ for library, (pattern, guix_pattern) in patterns.items(): -+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") -+ if line.find(store_dir) != -1: -+ m = guix_pattern.match(word) -+ else: -+ m = pattern.match(word) - if m: - del patterns[library] - shlibs.append(m.group()) - ---- a/giscanner/utils.py -+++ b/giscanner/utils.py -@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): - 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): ---- a/tests/scanner/test_shlibs.py -+++ b/tests/scanner/test_shlibs.py -@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): - - self.assertEqual( - sanitize_shlib_path('/foo/bar'), -- '/foo/bar' if sys.platform == 'darwin' else 'bar') -+ # Always use an absolute filename for Guix -+ '/foo/bar') - - def test_unresolved_library(self): -output = '' diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch deleted file mode 100644 index 6a86b56b44..0000000000 --- a/gnu/packages/patches/gobject-introspection-cc.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use gcc as the default C compiler if CC is not set. - -diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py ---- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100 -+++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100 -@@ -22,6 +22,8 @@ - builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') - if builddir is not None: - __path__.append(os.path.join(builddir, 'giscanner')) -+if not 'CC' in os.environ: -+ os.environ['CC'] = 'gcc' - try: - from ._version import __version__ - except ImportError: -- 2.28.0