Package: guix-patches;
Reported by: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Date: Sun, 26 Mar 2023 19:22:02 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 62467 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Subject: [bug#62467] [PATCH gnome-team v3 05/15] gnu: Make gobject-introspection-next the new gobject-introspection. Date: Sun, 26 Mar 2023 21:14:47 +0200
* gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1.
(gobject-introspection-next): Delete variable.
* gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]:
Replace gobject-introspection-next with gobject-introspection.
* gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]:
Replace gobject-introspection-next with gobject-introspection.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch:
Rename to…
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch:
… this.
* gnu/packages/patches/gobject-introspection-cc-1.72.patch: Rename to…
* gnu/packages/patches/gobject-introspection-cc.patch: … this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
gnu/local.mk | 2 -
gnu/packages/glib.scm | 21 +--
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile-xyz.scm | 2 +-
...trospection-absolute-shlib-path-1.72.patch | 173 ------------------
...ct-introspection-absolute-shlib-path.patch | 51 +++---
.../gobject-introspection-cc-1.72.patch | 15 --
.../patches/gobject-introspection-cc.patch | 11 +-
8 files changed, 39 insertions(+), 238 deletions(-)
delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index f0a228f19f..67ec1b754a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1264,9 +1264,7 @@ dist_patch_DATA = \
%D%/packages/patches/gnutls-cross.patch \
%D%/packages/patches/gnutls-guile-eintr-eagain.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
- %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
- %D%/packages/patches/gobject-introspection-cc-1.72.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
%D%/packages/patches/go-fix-script-tests.patch \
%D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index d9a9c58fbb..4bc7198ccb 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -477,14 +477,14 @@ (define target-name
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.66.1")
+ (version "1.73.1")
(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 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
(patches (search-patches
"gobject-introspection-cc.patch"
"gobject-introspection-girepository.patch"
@@ -564,23 +564,6 @@ (define gobject-introspection
;; For tools.
license:gpl2+))))
-(define-public gobject-introspection-next
- (package
- (inherit gobject-introspection)
- (name "gobject-introspection")
- (version "1.73.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/"
- "gobject-introspection/" (version-major+minor version)
- "/gobject-introspection-" version ".tar.xz"))
- (sha256
- (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
- (patches (search-patches
- "gobject-introspection-cc-1.72.patch"
- "gobject-introspection-girepository.patch"
- "gobject-introspection-absolute-shlib-path-1.72.patch"))))))
-
(define intltool
(package
(name "intltool")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 589d861a50..3e57035bac 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -698,7 +698,7 @@ (define-public gtksourceview
(list `(,glib "bin") ; for glib-genmarshal, etc.
gettext-minimal
gi-docgen
- gobject-introspection-next
+ gobject-introspection
pkg-config
vala
;; For testing.
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e6cef165ea..2bd5e1448c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2340,7 +2340,7 @@ (define (get lib)
clutter
xorg-server-for-tests))
(propagated-inputs
- (list gobject-introspection-next))
+ (list gobject-introspection))
(home-page "https://www.gnu.org/software/g-golf/")
(synopsis "Guile bindings for GObject Introspection")
(description
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
deleted file mode 100644
index 8bb86467c0..0000000000
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
+++ /dev/null
@@ -1,173 +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 <lucabru <at> src.gnome.org>,
-for 'gobject-introspection' 1.40.0 in Nix.
-
-It has since been updated to work with newer versions of
-gobject-introspection.
-
-diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index 1d39ab84..e12ed24e 100644
---- 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__)
-@@ -220,6 +253,10 @@ match the namespace prefix.""")
- parser.add_option("", "--compiler",
- action="store", dest="compiler", default=None,
- help="the C compiler to use internally")
-+ 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)
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 9f8ab5df..8aa37c99 100644
---- 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().
-@@ -108,7 +116,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):
-@@ -117,19 +126,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 []
-
-@@ -141,8 +149,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())
-diff --git a/giscanner/utils.py b/giscanner/utils.py
-index 31c7ea48..630002a8 100644
---- a/giscanner/utils.py
-+++ b/giscanner/utils.py
-@@ -114,16 +114,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
-- # 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
-
-
- # Returns arguments for invoking libtool, if applicable, otherwise None
-diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
-index a8337c60..7f123103 100644
---- a/tests/scanner/test_shlibs.py
-+++ b/tests/scanner/test_shlibs.py
-@@ -40,7 +40,8 @@ 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-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
index 956fa617c3..8bb86467c0 100644
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
+++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
@@ -1,11 +1,14 @@
-# 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 <at> src.gnome.org> for
-# 'gobject-introspection' 1.40.0 in Nix.
-#
-# It has since been updated to work with newer versions of
-# gobject-introspection.
+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 <at> src.gnome.org>,
+for 'gobject-introspection' 1.40.0 in Nix.
+
+It has since been updated to work with newer versions of
+gobject-introspection.
+
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index 1d39ab84..e12ed24e 100644
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
@@ -48,10 +51,10 @@
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")
+@@ -220,6 +253,10 @@ match the namespace prefix.""")
+ parser.add_option("", "--compiler",
+ action="store", dest="compiler", default=None,
+ help="the C compiler to use internally")
+ parser.add_option("", "--fallback-library-path",
+ action="store", dest="fallback_libpath",
+ default=_get_default_fallback_libpath(),
@@ -59,6 +62,8 @@
group = get_preprocessor_option_group(parser)
parser.add_option_group(group)
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index 9f8ab5df..8aa37c99 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
@@ -76,7 +81,7 @@
# 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):
+@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries):
output = output.decode("utf-8", "replace")
shlibs = resolve_from_ldd_output(libraries, output)
@@ -86,7 +91,7 @@
def sanitize_shlib_path(lib):
-@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
+@@ -117,19 +126,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
@@ -111,7 +116,7 @@
if len(patterns) == 0:
return []
-@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output):
+@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output):
if line.endswith(':'):
continue
for word in line.split():
@@ -126,10 +131,11 @@
if m:
del patterns[library]
shlibs.append(m.group())
-
+diff --git a/giscanner/utils.py b/giscanner/utils.py
+index 31c7ea48..630002a8 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
-@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
+@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
if dlname is None:
return None
@@ -141,8 +147,7 @@
- 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)
@@ -151,10 +156,12 @@
+ return libdir + '/' + dlbasename
- def extract_libtool(la_file):
+ # Returns arguments for invoking libtool, if applicable, otherwise None
+diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
+index a8337c60..7f123103 100644
--- a/tests/scanner/test_shlibs.py
+++ b/tests/scanner/test_shlibs.py
-@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase):
+@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase):
self.assertEqual(
sanitize_shlib_path('/foo/bar'),
@@ -163,4 +170,4 @@
+ '/foo/bar')
def test_unresolved_library(self):
-output = ''
+ output = ''
diff --git a/gnu/packages/patches/gobject-introspection-cc-1.72.patch b/gnu/packages/patches/gobject-introspection-cc-1.72.patch
deleted file mode 100644
index d3b1df82af..0000000000
--- a/gnu/packages/patches/gobject-introspection-cc-1.72.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use gcc as the default C compiler if CC is not set.
-
-diff --git a/giscanner/__init__.py b/giscanner/__init__.py
-index 7c2f365a..607fe341 100644
---- a/giscanner/__init__.py
-+++ b/giscanner/__init__.py
-@@ -21,6 +21,8 @@ import os
- builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
- if builddir is not None:
- __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422
-+if not 'CC' in os.environ:
-+ os.environ['CC'] = 'gcc'
- try:
- from ._version import __version__
- except ImportError:
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch
index 6a86b56b44..d3b1df82af 100644
--- a/gnu/packages/patches/gobject-introspection-cc.patch
+++ b/gnu/packages/patches/gobject-introspection-cc.patch
@@ -1,12 +1,13 @@
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 @@
+diff --git a/giscanner/__init__.py b/giscanner/__init__.py
+index 7c2f365a..607fe341 100644
+--- a/giscanner/__init__.py
++++ b/giscanner/__init__.py
+@@ -21,6 +21,8 @@ import os
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:
--
2.39.2
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.