<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/54761193303aba7b45e0b48a13cab520810a620c">https://github.com/macports/macports-ports/commit/54761193303aba7b45e0b48a13cab520810a620c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 54761193303 gobject-introspection-devel: update to 1.70.0
</span>54761193303 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 54761193303aba7b45e0b48a13cab520810a620c
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sun Feb 6 11:41:06 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    gobject-introspection-devel: update to 1.70.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/43079
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/45448
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/53699
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/59940
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/62863
</span>---
 gnome/gobject-introspection-devel/Portfile         | 49 ++++++++-------------
 .../files/no-env-shebang.patch                     | 11 -----
 .../patch-fix-scanner-in-build-execution.diff      | 14 +++---
 .../files/patch-fix-tools-python.diff              | 11 +++++
 .../files/patch-giscanner_girparser_py.diff        | 50 ----------------------
 .../files/use-AC_PROG_CPP.patch                    | 11 -----
 6 files changed, 37 insertions(+), 109 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection-devel/Portfile b/gnome/gobject-introspection-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ac31b8758e..a94ffc7094a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gobject-introspection-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,14 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           meson 1.0
</span> PortGroup           active_variants 1.1
 
 name                gobject-introspection-devel
 conflicts           gobject-introspection
 set my_name         gobject-introspection
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             1.60.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             1.70.0
</span> revision            0
 
 categories          gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,15 +28,17 @@ dist_subdir         ${my_name}
</span> distname            ${my_name}-${version}
 use_xz              yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  6455f1b5e4427b8f0a26efb94597a476ed9ca96e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  ffdfe2368fb2e34a547898b01aac0520d52d8627fdeb1c306559bcb503ab5e9c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    1285000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  5d13fba531e1f1d1260722aacb524f1da650302e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    1029372
</span> 
 set py_ver          3.9
 set py_ver_nodot    [string map {. {}} ${py_ver}]
 
 depends_build       port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:autoconf-archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${py_ver_nodot}-cython
</span> 
 depends_lib         path:lib/pkgconfig/cairo.pc:cairo \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,43 +46,29 @@ depends_lib         path:lib/pkgconfig/cairo.pc:cairo \
</span>                     port:py${py_ver_nodot}-mako \
                     port:py${py_ver_nodot}-markdown
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run         bin:glibtool:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          no-env-shebang.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-fix-rpath-gir-typelib.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-fix-rpath-gir-typelib.diff \
</span>                     patch-fix-scanner-in-build-execution.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-giscanner_girparser_py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-fix-tools-python.diff
</span> 
 post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|libcairo-gobject.2.dylib|${prefix}/lib/libcairo-gobject.2.dylib|g" ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|libcairo-gobject.2.dylib|${prefix}/lib/libcairo-gobject.2.dylib|g" ${worksrcpath}/gir/meson.build
</span>     reinplace "s|@MP_LIB@|${prefix}/lib/|g" ${worksrcpath}/giscanner/shlibs.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@MP_PYTHON_CMD@|${configure.python}|g" ${worksrcpath}/tools/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|#!/usr/bin/env python3|#!${configure.python}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/misc/update-glib-annotations.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        misc/update-gtkdoc-tests.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        misc/update-vulkan-gir.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        tests/gi-tester
</span> }
 
 configure.python    ${prefix}/bin/python${py_ver}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Use autoreconf to sync with our build tools.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The gtk-doc dependency is needed due to use of autoreconf -fvi, which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# completely regenerates the build system, which uses gtkdocize.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: check if not using -i with autoreconf works; if so, gtk-doc can
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# be removed. Also check if running only autoconf and automake is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sufficient, rather than a full autoreconf.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append    port:gtk-doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   use-AC_PROG_CPP.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf      yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args     -fvi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args          CC="${configure.cc} ${configure.cc_archflags}" V=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args      -Ddoctool=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -Dpython=${configure.python}
</span> 
 platform darwin 8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # GObject introspection doesn't build with tiger's make, #32358
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:gmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.cmd               ${prefix}/bin/gmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     # Tiger does not support RPATHs at this time
     patchfiles-append patch-girscanner-tiger-no-rpath.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Tiger requires
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --disable-dependency-tracking
</span> }
 
 livecheck.type      gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection-devel/files/no-env-shebang.patch b/gnome/gobject-introspection-devel/files/no-env-shebang.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 79ad321fbd3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection-devel/files/no-env-shebang.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile-tools.am.orig 2018-09-29 11:39:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile-tools.am      2018-09-29 11:40:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,7 +9,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   tools/g-ir-tool-template.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   tools/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON), -e s,@GIR_DIR\@,$(GIR_DIR),g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,$(PYTHON), -e s,@GIR_DIR\@,$(GIR_DIR),g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g-ir-scanner: tools/g-ir-tool-template.in _giscanner.la Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,scannermain, -e s,@TOOL_FUNCTION\@,scanner_main, $< > $@.tmp && mv $@.tmp $@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection-devel/files/patch-fix-scanner-in-build-execution.diff b/gnome/gobject-introspection-devel/files/patch-fix-scanner-in-build-execution.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b16a7b5c49b..baa469b81f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection-devel/files/patch-fix-scanner-in-build-execution.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gobject-introspection-devel/files/patch-fix-scanner-in-build-execution.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,11 @@
</span> --- giscanner/ccompiler.py.orig
 +++ giscanner/ccompiler.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -184,7 +184,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,7 +184,7 @@
</span>          if os.name == 'nt':
              runtime_path_envvar = ['LIB', 'PATH']
          else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>--            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            if sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                runtime_path_envvar = ['DYLD_LIBRARY_PATH']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                runtime_path_envvar = ['LD_LIBRARY_PATH']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            runtime_path_envvar = ['DYLD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
</span>              # Search the current directory first
              # (This flag is not supported nor needed for Visual C++)
              args.append('-L.')
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +44,7 @@
</span>              self._compiler.get_internal_link_flags(args,
 --- giscanner/pkgconfig.py.orig
 +++ giscanner/pkgconfig.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,10 +52,15 @@
</span>  
  def libs(packages, msvc_syntax=False, ignore_errors=True, command=None):
      flags = ['--msvc-syntax'] if msvc_syntax else []
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,3 +60,6 @@
</span> +    flags.extend(packages)
 +    out_libs_only_L = shlex.split(check_output(flags, ignore_errors, command))
 +    return out_libs_only_not_L, out_libs_only_L
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def bindir(packages, ignore_errors=True, command=None):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection-devel/files/patch-fix-tools-python.diff b/gnome/gobject-introspection-devel/files/patch-fix-tools-python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d34cf2d363e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gobject-introspection-devel/files/patch-fix-tools-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/meson.build.orig 2022-02-05 15:05:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/meson.build      2022-02-05 15:07:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   tools_conf.set('libdir', libdir_abs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   tools_conf.set('datarootdir', datadir_abs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   tools_conf.set('gir_dir_prefix', gir_dir_prefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  tools_conf.set('PYTHON_CMD', python_cmd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  tools_conf.set('PYTHON_CMD', '@MP_PYTHON_CMD@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   tools_conf.set('TOOL_MODULE', tool[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   tools_conf.set('TOOL_FUNCTION', tool[2])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection-devel/files/patch-giscanner_girparser_py.diff b/gnome/gobject-introspection-devel/files/patch-giscanner_girparser_py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bf538995435..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection-devel/files/patch-giscanner_girparser_py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- giscanner/girparser.py.orig    2021-03-18 14:46:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ giscanner/girparser.py 2021-03-18 14:47:41.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,17 +75,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     def _find_first_child(self, node, name_or_names):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if isinstance(name_or_names, str):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            for child in node.getchildren():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            for child in node:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 if child.tag == name_or_names:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     return child
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            for child in node.getchildren():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            for child in node:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 if child.tag in name_or_names:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     return child
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     def _find_children(self, node, name):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        return [child for child in node.getchildren() if child.tag == name]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        return [child for child in node if child.tag == name]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     def _get_current_file(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if not self._filename_stack:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,7 +103,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             raise SystemExit("%s: Incompatible version %s (supported: %s)" %
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                              (self._get_current_file(), version, COMPATIBLE_GIR_VERSION))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        for node in root.getchildren():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        for node in root:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             if node.tag == _corens('include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 self._parse_include(node)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             elif node.tag == _corens('package'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,7 +144,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             parser_methods[_corens('constant')] = self._parse_constant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             parser_methods[_corens('function')] = self._parse_function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        for node in ns.getchildren():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        for node in ns:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             method = parser_methods.get(node.tag)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             if method is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 method(node)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -395,7 +395,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     def _parse_fields(self, node, obj):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         res = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         names = (_corens('field'), _corens('record'), _corens('union'), _corens('callback'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        for child in node.getchildren():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        for child in node:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             if child.tag in names:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 fieldobj = self._parse_field(child, obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 res.append(fieldobj)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection-devel/files/use-AC_PROG_CPP.patch b/gnome/gobject-introspection-devel/files/use-AC_PROG_CPP.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6c25b759a79..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection-devel/files/use-AC_PROG_CPP.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CPP needs to be set since it is used by AM_CHECK_PYTHON_HEADERS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig      2019-06-16 04:14:20.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac   2021-03-16 20:21:17.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,6 +47,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Checks for programs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PROG_CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_PROG_CC_C_O
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_MKDIR_P
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span></pre><pre style='margin:0'>

</pre>