<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/d814edefb7b045e6cb14cfac7d88c1f91bbabe52">https://github.com/macports/macports-ports/commit/d814edefb7b045e6cb14cfac7d88c1f91bbabe52</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 d814edefb7b gobject-introspection: add libtool library path tweaks to scanner
</span>d814edefb7b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d814edefb7b045e6cb14cfac7d88c1f91bbabe52
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Nov 11 20:53:00 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> gobject-introspection: add libtool library path tweaks to scanner
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Hopefully the final tweaks, since they now handle both libtool and non-libtool library references, both in-build and outside-build.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now works work: gobject-introspection, poppler, gstreamer1-gst-plugins-base, py38-gobject3, gexiv2, and libsoup
</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/61427
</span>---
gnome/gobject-introspection/Portfile | 2 +-
.../patch-fix-scanner-in-build-execution.diff | 27 +++++++++++-----------
2 files changed, 14 insertions(+), 15 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 56232a75d3c..f533c99b2e2 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 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</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 60a717b66ce..b16a7b5c49b 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,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,8 +236,28 @@
</span>
args.extend(sources)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,25 +24,24 @@
</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:#ffe0e0;'>-+ # remove self._options.library_paths entries that are in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # "this_L" already, since those are "system" and will be found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # via the "runtime_path_envvar" setting below
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_L = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for t_L in self._options.library_paths:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if t_L not in this_L:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_L.append (t_L)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self._options.library_paths = tmp_L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # uniquely merge pkg_config and options library paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self._options.library_paths = list (set().union (self._options.library_paths,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this_L))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # remove anything in LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env_LIBRARY_PATH = os.environ['LIBRARY_PATH'].split(':') if \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'LIBRARY_PATH' in os.environ else []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self._options.library_paths = [l for l in self._options.library_paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if l not in env_LIBRARY_PATH]
</span> +
+ if os.name == 'nt':
+ runtime_path_envvar = ['LIB', 'PATH']
+ else:
+ runtime_path_envvar = ['LIBRARY_PATH']
+ for envvar in runtime_path_envvar:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if envvar in os.environ:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.environ[envvar] = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.pathsep.join(this_L + [os.environ[envvar]])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.environ[envvar] = os.pathsep.join(this_L)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.environ[envvar] = os.pathsep.join \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (list (set().union (os.environ[envvar].split(':'), this_L))) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if envvar in os.environ else os.pathsep.join(this_L)
</span>
if not self._options.external_library:
self._compiler.get_internal_link_flags(args,
</pre><pre style='margin:0'>
</pre>