gobject-introspection: Remove unused patches

See https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1087

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1481>

4 files changed, 0 insertions, 261 deletions

diff --git a/recipes/gobject-introspection/0001-Drop-deprecated-xml.etree.ElementTree.Element.getchi.patch b/recipes/gobject-introspection/0001-Drop-deprecated-xml.etree.ElementTree.Element.getchi.patch
deleted file mode 100644
index dc14fb80..00000000
--- a/recipes/gobject-introspection/0001-Drop-deprecated-xml.etree.ElementTree.Element.getchi.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 1f9284228092b2a7200e8a78bc0ea6702231c6db Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 6 Jan 2020 14:05:03 +0100
-Subject: [PATCH] Drop deprecated xml.etree.ElementTree.Element.getchildren()
- calls
-
-The XML elements are implicitly iterable in all Python versions including
-at least 2.7 and 3.2+.
-
-The .getchildren() method is deprecated since 2.7 and 3.2, removed in 3.9.
-
-Fixes https://gitlab.gnome.org/GNOME/gobject-introspection/issues/325
----
- giscanner/girparser.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/giscanner/girparser.py b/giscanner/girparser.py
-index 7687c35c..0a6c687b 100644
---- a/giscanner/girparser.py
-+++ b/giscanner/girparser.py
-@@ -75,17 +75,17 @@ class GIRParser(object):
- 
-     def _find_first_child(self, node, name_or_names):
-         if isinstance(name_or_names, str):
--            for child in node.getchildren():
-+            for child in node:
-                 if child.tag == name_or_names:
-                     return child
-         else:
--            for child in node.getchildren():
-+            for child in node:
-                 if child.tag in name_or_names:
-                     return child
-         return None
- 
-     def _find_children(self, node, name):
--        return [child for child in node.getchildren() if child.tag == name]
-+        return [child for child in node if child.tag == name]
- 
-     def _get_current_file(self):
-         if not self._filename_stack:
-@@ -103,7 +103,7 @@ class GIRParser(object):
-             raise SystemExit("%s: Incompatible version %s (supported: %s)" %
-                              (self._get_current_file(), version, COMPATIBLE_GIR_VERSION))
- 
--        for node in root.getchildren():
-+        for node in root:
-             if node.tag == _corens('include'):
-                 self._parse_include(node)
-             elif node.tag == _corens('package'):
-@@ -145,7 +145,7 @@ class GIRParser(object):
-             parser_methods[_corens('constant')] = self._parse_constant
-             parser_methods[_corens('function')] = self._parse_function
- 
--        for node in ns.getchildren():
-+        for node in ns:
-             method = parser_methods.get(node.tag)
-             if method is not None:
-                 method(node)
-@@ -413,7 +413,7 @@ class GIRParser(object):
-     def _parse_fields(self, node, obj):
-         res = []
-         names = (_corens('field'), _corens('record'), _corens('union'), _corens('callback'))
--        for child in node.getchildren():
-+        for child in node:
-             if child.tag in names:
-                 fieldobj = self._parse_field(child, obj)
-                 res.append(fieldobj)
--- 
-2.31.1
-
diff --git a/recipes/gobject-introspection/0001-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch b/recipes/gobject-introspection/0001-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch
deleted file mode 100644
index 51ba11f6..00000000
--- a/recipes/gobject-introspection/0001-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e900cab3d70924044c05f00d6da3870d0535c5b5 Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@centricular.com>
-Date: Fri, 17 Aug 2018 21:13:15 +0530
-Subject: [PATCH] giscanner: Fix shared-library name with Meson on macOS
-
-Also handle some other install_name cases which are not currently used
-by Meson, but may be in the future.
-
-Closes https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
----
- giscanner/shlibs.py | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index c93d20c..4d4915d 100644
---- a/giscanner/shlibs.py
-+++ b/giscanner/shlibs.py
-@@ -43,6 +43,22 @@ def _resolve_libtool(options, binary, libraries):
- 
-     return shlibs
- 
-+def _sanitize_install_name(install_name):
-+    '''
-+    On macOS, the dylib can be built with install_name as @rpath/libfoo.so
-+    instead of the absolute path to the library, so handle that. The name
-+    can also be @loader_path or @executable_path.
-+    '''
-+    if not install_name.startswith('@'):
-+        return install_name
-+    if install_name.startswith('@rpath/'):
-+        return install_name[7:]
-+    if install_name.startswith('@loader_path/'):
-+        return install_name[13:]
-+    if install_name.startswith('@executable_path/'):
-+        return install_name[17:]
-+    raise RuntimeError('Unknown install_name {!r}'.format(install_name))
-+
- 
- # Assume ldd output is something vaguely like
- #
-@@ -121,7 +137,7 @@ def _resolve_non_libtool(options, binary, libraries):
-                 m = pattern.search(line)
-                 if m:
-                     del patterns[library]
--                    shlibs.append(m.group(1))
-+                    shlibs.append(_sanitize_install_name(m.group(1)))
-                     break
- 
-         if len(patterns) > 0:
--- 
-2.15.2 (Apple Git-101.1)
-
diff --git a/recipes/gobject-introspection/0002-Fix-non-libtool-build.patch b/recipes/gobject-introspection/0002-Fix-non-libtool-build.patch
deleted file mode 100644
index 8ddf0399..00000000
--- a/recipes/gobject-introspection/0002-Fix-non-libtool-build.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 2c4ae87140cc719a7e94a59b421374bbeee898c2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Mon, 5 Nov 2018 14:57:21 -0500
-Subject: [PATCH 1/3] scanner: Pass library paths before the -l itself
-
-Without this, it will probably take the system library instead of the
-one that we are trying to test.
----
- giscanner/ccompiler.py | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index c0038285..78e3825f 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -133,17 +133,6 @@ class CCompiler(object):
-                 if sys.platform != 'darwin':
-                     args.append('-Wl,--no-as-needed')
- 
--        for library in libraries + extra_libraries:
--            if self.check_is_msvc():
--                # Note that Visual Studio builds do not use libtool!
--                if library != 'm':
--                    args.append(library + '.lib')
--            else:
--                if library.endswith(".la"):  # explicitly specified libtool library
--                    args.append(library)
--                else:
--                    args.append('-l' + library)
--
-         for library_path in libpaths:
-             # The dumper program needs to look for dynamic libraries
-             # in the library paths first
-@@ -161,6 +150,17 @@ class CCompiler(object):
- 
-             runtime_paths.append(library_path)
- 
-+        for library in libraries + extra_libraries:
-+            if self.check_is_msvc():
-+                # Note that Visual Studio builds do not use libtool!
-+                if library != 'm':
-+                    args.append(library + '.lib')
-+            else:
-+                if library.endswith(".la"):  # explicitly specified libtool library
-+                    args.append(library)
-+                else:
-+                    args.append('-l' + library)
-+
-         for envvar in runtime_path_envvar:
-             if envvar in os.environ:
-                 os.environ[envvar] = \
--- 
-2.18.1
-
-
-From a4cfd0a8e5542e333810bd94091a5176cbc2901a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Mon, 5 Nov 2018 15:41:12 -0500
-Subject: [PATCH 2/3] scanner: Accept library filenames
-
-This makes it easier to ensure that the right library is
-scanned.
----
- giscanner/ccompiler.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index 78e3825f..d327c581 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -156,7 +156,8 @@ class CCompiler(object):
-                 if library != 'm':
-                     args.append(library + '.lib')
-             else:
--                if library.endswith(".la"):  # explicitly specified libtool library
-+                # If we get a real filename, just use it as-is
-+                if library.endswith(".la") or os.path.isfile(library):
-                     args.append(library)
-                 else:
-                     args.append('-l' + library)
--- 
-2.18.1
-
-
-From 630f6626a89322f62b0709c3bab686c4c555c73c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Mon, 5 Nov 2018 16:57:57 -0500
-Subject: [PATCH 3/3] scanner: Skip ldd for library by filename
-
----
- giscanner/shlibs.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 7b7b2d02..f70c54da 100644
---- a/giscanner/shlibs.py
-+++ b/giscanner/shlibs.py
-@@ -119,7 +119,10 @@ def _resolve_non_libtool(options, binary, libraries):
-         proc = subprocess.Popen(args, stdout=subprocess.PIPE)
-         patterns = {}
-         for library in libraries:
--            patterns[library] = _ldd_library_pattern(library)
-+            if not os.path.isfile(library):
-+                patterns[library] = _ldd_library_pattern(library)
-+        if len(patterns) == 0:
-+            return []
- 
-         shlibs = []
-         for line in proc.stdout:
--- 
-2.18.1
-
diff --git a/recipes/gobject-introspection/0003-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch b/recipes/gobject-introspection/0003-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch
deleted file mode 100644
index 03dcf314..00000000
--- a/recipes/gobject-introspection/0003-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f3909530243de0706d205cbc122e3eb5dd5c171e Mon Sep 17 00:00:00 2001
-From: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
-Date: Wed, 20 Jun 2018 07:49:45 -0700
-Subject: [PATCH] giscanner:  do not override dyld search path on macOS
-
-Closes https://gitlab.gnome.org/GNOME/gobject-introspection/issues/205
----
- giscanner/ccompiler.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index bd739ffa..ecbeb684 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -119,7 +119,7 @@ class CCompiler(object):
-         if os.name == 'nt':
-             runtime_path_envvar = ['LIB', 'PATH']
-         else:
--            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH']
-+            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
-             # Search the current directory first
-             # (This flag is not supported nor needed for Visual C++)
-             args.append('-L.')
--- 
-2.20.1
-