summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLiliana Marie Prikler <liliana.prikler@gmail.com>2022-08-12 18:51:12 +0200
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2022-08-12 18:51:12 +0200
commitd08411ffd0a36a6b67a238be69d32c9f74101389 (patch)
treebdc5b0377106dcd9ae5f173120a888fc2fde5884 /gnu
parent60c4b012ff66680821381dcc5ae7f6073e61a7e2 (diff)
Revert "gnu: gobject-introspection: Update to 1.72.0."
This reverts commit 60c4b012ff66680821381dcc5ae7f6073e61a7e2. gobject-introspection was already updated to 1.72.0 prior to this patch.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch50
1 files changed, 25 insertions, 25 deletions
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
index ae75355beea..8bb86467c08 100644
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
+++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
@@ -7,10 +7,10 @@ for 'gobject-introspection' 1.40.0 in Nix.
7It has since been updated to work with newer versions of 7It has since been updated to work with newer versions of
8gobject-introspection. 8gobject-introspection.
9 9
10Index: gobject-introspection-1.72.0/giscanner/scannermain.py 10diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
11=================================================================== 11index 1d39ab84..e12ed24e 100644
12--- gobject-introspection-1.72.0.orig/giscanner/scannermain.py 12--- a/giscanner/scannermain.py
13+++ gobject-introspection-1.72.0/giscanner/scannermain.py 13+++ b/giscanner/scannermain.py
14@@ -95,6 +95,39 @@ def get_windows_option_group(parser): 14@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
15 return group 15 return group
16 16
@@ -51,21 +51,21 @@ Index: gobject-introspection-1.72.0/giscanner/scannermain.py
51 def _get_option_parser(): 51 def _get_option_parser():
52 parser = optparse.OptionParser('%prog [options] sources', 52 parser = optparse.OptionParser('%prog [options] sources',
53 version='%prog ' + giscanner.__version__) 53 version='%prog ' + giscanner.__version__)
54@@ -217,6 +250,10 @@ match the namespace prefix.""") 54@@ -220,6 +253,10 @@ match the namespace prefix.""")
55 parser.add_option("", "--filelist", 55 parser.add_option("", "--compiler",
56 action="store", dest="filelist", default=[], 56 action="store", dest="compiler", default=None,
57 help="file containing headers and sources to be scanned") 57 help="the C compiler to use internally")
58+ parser.add_option("", "--fallback-library-path", 58+ parser.add_option("", "--fallback-library-path",
59+ action="store", dest="fallback_libpath", 59+ action="store", dest="fallback_libpath",
60+ default=_get_default_fallback_libpath(), 60+ default=_get_default_fallback_libpath(),
61+ help="Path to prepend to unknown shared libraries") 61+ help="Path to prepend to unknown shared libraries")
62 parser.add_option("", "--compiler", 62
63 action="store", dest="compiler", default=None, 63 group = get_preprocessor_option_group(parser)
64 help="the C compiler to use internally") 64 parser.add_option_group(group)
65Index: gobject-introspection-1.72.0/giscanner/shlibs.py 65diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
66=================================================================== 66index 9f8ab5df..8aa37c99 100644
67--- gobject-introspection-1.72.0.orig/giscanner/shlibs.py 67--- a/giscanner/shlibs.py
68+++ gobject-introspection-1.72.0/giscanner/shlibs.py 68+++ b/giscanner/shlibs.py
69@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): 69@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
70 $""" % re.escape(library_name), re.VERBOSE) 70 $""" % re.escape(library_name), re.VERBOSE)
71 71
@@ -81,7 +81,7 @@ Index: gobject-introspection-1.72.0/giscanner/shlibs.py
81 # This is a what we do for non-la files. We assume that we are on an 81 # This is a what we do for non-la files. We assume that we are on an
82 # ELF-like system where ldd exists and the soname extracted with ldd is 82 # ELF-like system where ldd exists and the soname extracted with ldd is
83 # a filename that can be opened with dlopen(). 83 # a filename that can be opened with dlopen().
84@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary 84@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries):
85 output = output.decode("utf-8", "replace") 85 output = output.decode("utf-8", "replace")
86 86
87 shlibs = resolve_from_ldd_output(libraries, output) 87 shlibs = resolve_from_ldd_output(libraries, output)
@@ -116,7 +116,7 @@ Index: gobject-introspection-1.72.0/giscanner/shlibs.py
116 if len(patterns) == 0: 116 if len(patterns) == 0:
117 return [] 117 return []
118 118
119@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, o 119@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output):
120 if line.endswith(':'): 120 if line.endswith(':'):
121 continue 121 continue
122 for word in line.split(): 122 for word in line.split():
@@ -131,10 +131,10 @@ Index: gobject-introspection-1.72.0/giscanner/shlibs.py
131 if m: 131 if m:
132 del patterns[library] 132 del patterns[library]
133 shlibs.append(m.group()) 133 shlibs.append(m.group())
134Index: gobject-introspection-1.72.0/giscanner/utils.py 134diff --git a/giscanner/utils.py b/giscanner/utils.py
135=================================================================== 135index 31c7ea48..630002a8 100644
136--- gobject-introspection-1.72.0.orig/giscanner/utils.py 136--- a/giscanner/utils.py
137+++ gobject-introspection-1.72.0/giscanner/utils.py 137+++ b/giscanner/utils.py
138@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): 138@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
139 if dlname is None: 139 if dlname is None:
140 return None 140 return None
@@ -157,10 +157,10 @@ Index: gobject-introspection-1.72.0/giscanner/utils.py
157 157
158 158
159 # Returns arguments for invoking libtool, if applicable, otherwise None 159 # Returns arguments for invoking libtool, if applicable, otherwise None
160Index: gobject-introspection-1.72.0/tests/scanner/test_shlibs.py 160diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
161=================================================================== 161index a8337c60..7f123103 100644
162--- gobject-introspection-1.72.0.orig/tests/scanner/test_shlibs.py 162--- a/tests/scanner/test_shlibs.py
163+++ gobject-introspection-1.72.0/tests/scanner/test_shlibs.py 163+++ b/tests/scanner/test_shlibs.py
164@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase): 164@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase):
165 165
166 self.assertEqual( 166 self.assertEqual(