<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bc995b4ad5fa9c7ac0d42ca0299a8f26cead18d1">https://github.com/macports/macports-ports/commit/bc995b4ad5fa9c7ac0d42ca0299a8f26cead18d1</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 bc995b4 mlt-qt5: fix parse failure
</span>bc995b4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bc995b4ad5fa9c7ac0d42ca0299a8f26cead18d1
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 17 02:54:20 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> mlt-qt5: fix parse failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix apparently incorrect cxxflags when installing without having
</span><span style='display:block; white-space:pre;color:#404040;'> qt5-qtbase installed beforehand. (This is the same circumstance under which
</span><span style='display:block; white-space:pre;color:#404040;'> the parse failure happened, so no need for a rev bump.)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Maintainer timeout.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/54861
</span>---
multimedia/mlt/Portfile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mlt/Portfile b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71add86..6dc27f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +43,14 @@ if {${subport} eq "${name}"} {
</span> if {[info procs qt5.active_version] eq ""} {
proc qt5.active_version {} {
global prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/bin/pkg-config]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set av [exec ${prefix}/bin/pkg-config --modversion Qt5Core]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file executable ${prefix}/bin/pkg-config]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![catch {exec ${prefix}/bin/pkg-config --modversion Qt5Core} av]} {
</span> return ${av}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # current version of the default dependency (which probably just isn't installed yet)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # exact version returned in this case isn't too important,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it's just compared with 5.7.0 below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 5.10.0
</span> }
}
}
</pre><pre style='margin:0'>
</pre>