<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/429e9d077ab34f58a5026941ab0f2164b5404485">https://github.com/macports/macports-ports/commit/429e9d077ab34f58a5026941ab0f2164b5404485</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 429e9d0 qt5*-qtlocation: fix dependencies
</span>429e9d0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 429e9d077ab34f58a5026941ab0f2164b5404485
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 9 13:42:02 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*-qtlocation: fix dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Newer versions of Qt Location use ICU and Zlib.
</span><span style='display:block; white-space:pre;color:#404040;'> Qt Location does not actually use OpenSSL.
</span><span style='display:block; white-space:pre;color:#404040;'> It is brought in automatically by Qt Network.
</span>---
aqua/qt5/Portfile | 7 +++++--
aqua/qt511/Portfile | 5 ++++-
aqua/qt59/Portfile | 7 +++++--
3 files changed, 14 insertions(+), 5 deletions(-)
<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 b473981..e29b90b 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;'>@@ -301,12 +301,12 @@ array set modules {
</span> 5905880
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:icu port:zlib"
</span> "qtbase qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport"
{"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtmacextras {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1367,6 +1367,9 @@ foreach {module module_info} [array get modules] {
</span> reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/config.tests/${test}/main.cpp
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid unnecessary dependency on OpenSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "QMAKE_LIBS_OPENSSL="
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b857dae..683a340 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,7 +309,7 @@ array set modules {
</span> 5589440
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:icu port:zlib"
</span> "qtbase qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport"
{"Qt Location" "Qt Positioning"}
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1387,6 +1387,9 @@ foreach {module module_info} [array get modules] {
</span> reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/Tools/qmake/config.tests/${test}/${test}.cpp
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid unnecessary dependency on OpenSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "QMAKE_LIBS_OPENSSL="
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6df7389..0c2a7e05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,12 +307,12 @@ array set modules {
</span> 5405312
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:icu port:zlib"
</span> "qtbase qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport"
{"Qt Location" "Qt Positioning"}
""
"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: "
}
qtmacextras {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1366,6 +1366,9 @@ foreach {module module_info} [array get modules] {
</span> reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/Tools/qmake/config.tests/${test}/${test}.cpp
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid unnecessary dependency on OpenSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "QMAKE_LIBS_OPENSSL="
</span> }
# special case
</pre><pre style='margin:0'>
</pre>