<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e6d093a57f6a86b0ace628ff70d6ec79fd3808ee">https://github.com/macports/macports-ports/commit/e6d093a57f6a86b0ace628ff70d6ec79fd3808ee</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 e6d093a57f6 gobject-introspection: add patch to fix in-build scanner execution
</span>e6d093a57f6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e6d093a57f6a86b0ace628ff70d6ec79fd3808ee
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Oct 16 13:06:45 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> gobject-introspection: add patch to fix in-build scanner execution
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ref: https://trac.macports.org/ticket/58574
</span>---
gnome/gobject-introspection/Portfile | 5 +-
.../patch-fix-scanner-in-build-execution.diff | 57 ++++++++++++++++++++++
2 files changed, 60 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection/Portfile b/gnome/gobject-introspection/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8cd1fc0ca48..bd53f415854 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gobject-introspection/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup active_variants 1.1
</span>
name gobject-introspection
version 1.60.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,8 @@ depends_lib path:lib/pkgconfig/cairo.pc:cairo \
</span> depends_run bin:glibtool:libtool
patchfiles no-env-shebang.patch \
<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;'>+ patch-fix-rpath-gir-typelib.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-scanner-in-build-execution.diff
</span>
post-patch {
reinplace "s|libcairo-gobject.2.dylib|${prefix}/lib/libcairo-gobject.2.dylib|g" ${worksrcpath}/configure.ac
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection/files/patch-fix-scanner-in-build-execution.diff b/gnome/gobject-introspection/files/patch-fix-scanner-in-build-execution.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fa872f402f2
</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/files/patch-fix-scanner-in-build-execution.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,57 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- giscanner/ccompiler.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ giscanner/ccompiler.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,7 +184,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.name == 'nt':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runtime_path_envvar = ['LIB', 'PATH']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ runtime_path_envvar = ['DYLD_LIBRARY_PATH']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ runtime_path_envvar = ['LD_LIBRARY_PATH']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Search the current directory first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (This flag is not supported nor needed for Visual C++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.append('-L.')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- giscanner/dumper.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ giscanner/dumper.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,8 +236,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pkg_config_libs = pkgconfig.libs(self._packages,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- msvc_syntax=self._compiler.check_is_msvc())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_config_libs, pkg_config_libs_only_L = pkgconfig.libs(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self._packages, msvc_syntax=self._compiler.check_is_msvc())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this_L = [lib[len('-L'):] for lib in pkg_config_libs_only_L]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if os.name == 'nt':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ runtime_path_envvar = ['LIB', 'PATH']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ runtime_path_envvar = ['LIBRARY_PATH']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for envvar in runtime_path_envvar:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if envvar in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.environ[envvar] = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.pathsep.join(this_L + [os.environ[envvar]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.environ[envvar] = os.pathsep.join(this_L)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not self._options.external_library:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self._compiler.get_internal_link_flags(args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- giscanner/pkgconfig.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ giscanner/pkgconfig.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def libs(packages, msvc_syntax=False, ignore_errors=True, command=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = ['--msvc-syntax'] if msvc_syntax else []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flags.append('--libs')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags.append('--libs-only-l')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags.append('--libs-only-other')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags.extend(packages)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- out = check_output(flags, ignore_errors, command)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return shlex.split(out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ out_libs_only_not_L = shlex.split(check_output(flags, ignore_errors, command))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = ['--msvc-syntax'] if msvc_syntax else []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags.append('--libs-only-L')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags.extend(packages)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ out_libs_only_L = shlex.split(check_output(flags, ignore_errors, command))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return out_libs_only_not_L, out_libs_only_L
</span></pre><pre style='margin:0'>
</pre>