<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00b51eda4588295950c31a935bf114aadae070d7">https://github.com/macports/macports-ports/commit/00b51eda4588295950c31a935bf114aadae070d7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 00b51eda4588295950c31a935bf114aadae070d7
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Dec 23 12:15:44 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: link qcollectiongenerator to qhelpgenerator
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> qcollectiongenerator was removed in
</span><span style='display:block; white-space:pre;color:#404040;'> http://code.qt.io/cgit/qt/qttools.git/commit/?h=5.12&id=30a75f7f
</span><span style='display:block; white-space:pre;color:#404040;'> However, some ports still depend on it (e.g. octave).
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57781
</span>---
aqua/qt5/Portfile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 906e329..2823e28 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,7 +156,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1020,6 +1020,13 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qcollectiongenerator was removed in http://code.qt.io/cgit/qt/qttools.git/commit/?h=5.12&id=30a75f7f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # however, some ports still depend on it (e.g. octave)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/57781
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s qhelpgenerator ${destroot}${qt_bins_dir}/qcollectiongenerator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # --prefix is not recognized.
configure.pre_args-delete --prefix=${prefix}
</pre><pre style='margin:0'>
</pre>