lle_bout pushed a commit to branch wip-gnome-40
in repository guix.
commit 3313dad6cd5635d3fdd6854a6044ad01c7d832be
Author: Léo Le Bouter <[email protected]>
AuthorDate: Tue Mar 23 20:16:23 2021 +0100
gnu: gobject-introspection: Update to 1.68.0.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch:
Rebase
patch.
* gnu/packages/patches/gobject-introspection-cc.patch: Rebase patch.
* gnu/packages/glib.scm (gobject-introspection): Update to 1.68.0.
---
gnu/packages/glib.scm | 4 ++--
.../patches/gobject-introspection-absolute-shlib-path.patch | 13 ++++++-------
gnu/packages/patches/gobject-introspection-cc.patch | 2 +-
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 0ddaf4d..e73260b 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -481,14 +481,14 @@ dynamic loading, and an object system.")
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.66.1")
+ (version "1.68.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
- (base32 "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"))
+ (base32 "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj"))
(patches (search-patches
"gobject-introspection-cc.patch"
"gobject-introspection-girepository.patch"
diff --git
a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
index 956fa61..5efbb07 100644
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
+++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
@@ -129,10 +129,10 @@
--- a/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:
return None
-
+
- # Darwin uses absolute paths where possible; since the libtool files never
- # contain absolute paths, use the libdir field
- if platform.system() == 'Darwin':
@@ -141,17 +141,16 @@
- 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
+- # 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):
+
+
+ # Returns arguments for invoking libtool, if applicable, otherwise None
--- a/tests/scanner/test_shlibs.py
+++ b/tests/scanner/test_shlibs.py
@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase):
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch
b/gnu/packages/patches/gobject-introspection-cc.patch
index 6a86b56..18c8920 100644
--- a/gnu/packages/patches/gobject-introspection-cc.patch
+++ b/gnu/packages/patches/gobject-introspection-cc.patch
@@ -6,7 +6,7 @@ diff -ru
gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introsp
@@ -22,6 +22,8 @@
builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
if builddir is not None:
- __path__.append(os.path.join(builddir, 'giscanner'))
+ __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore #
mypy issue #1422
+if not 'CC' in os.environ:
+ os.environ['CC'] = 'gcc'
try:
