<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8fb49743e47074c890d88f03de4528857b495dcb">https://github.com/macports/macports-ports/commit/8fb49743e47074c890d88f03de4528857b495dcb</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 8fb49743e47 gobject-introspection: tweak scanner patch
</span>8fb49743e47 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8fb49743e47074c890d88f03de4528857b495dcb
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Oct 30 12:23:09 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> gobject-introspection: tweak scanner patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now handles build-provided library paths more robustly, removing those that are found via PKGCONFIG and are thus clearly "system" paths.
</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/61382
</span>---
gnome/gobject-introspection/Portfile | 2 +-
.../files/patch-fix-scanner-in-build-execution.diff | 11 ++++++++++-
2 files changed, 11 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 bd53f415854..56232a75d3c 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 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome
platforms darwin
<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><span style='display:block; white-space:pre;color:#808080;'>index fa872f402f2..60a717b66ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection/files/patch-fix-scanner-in-build-execution.diff
</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;'>@@ -14,7 +14,7 @@
</span> args.append('-L.')
--- giscanner/dumper.py.orig
+++ giscanner/dumper.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -236,8 +236,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,8 +236,29 @@
</span>
args.extend(sources)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,15 @@
</span> + self._packages, msvc_syntax=self._compiler.check_is_msvc())
+ this_L = [lib[len('-L'):] for lib in pkg_config_libs_only_L]
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ # remove self._options.library_paths entries that are in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # "this_L" already, since those are "system" and will be found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # via the "runtime_path_envvar" setting below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp_L = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for t_L in self._options.library_paths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if t_L not in this_L:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp_L.append (t_L)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self._options.library_paths = tmp_L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> + if os.name == 'nt':
+ runtime_path_envvar = ['LIB', 'PATH']
+ else:
</pre><pre style='margin:0'>
</pre>