<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/9bb3f96f09d84d18d5e513ecbab08304952b2493">https://github.com/macports/macports-ports/commit/9bb3f96f09d84d18d5e513ecbab08304952b2493</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9bb3f96f09d84d18d5e513ecbab08304952b2493
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 23 14:54:40 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: OpenSSL fixes were put in wrong sub-port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/macports/macports-ports/commit/429e9d077ab34f58a5026941ab0f2164b5404485
</span>---
aqua/qt511/Portfile | 8 ++++----
aqua/qt59/Portfile | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
<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 7fe19a8..20fc053 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;'>@@ -314,7 +314,7 @@ array set modules {
</span> {"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;'>@@ -1365,6 +1365,9 @@ foreach {module module_info} [array get modules] {
</span> # std::auto_ptr was removed in C++17
# see https://bugreports.qt.io/browse/QTBUG-64441
configure.args-append DEFINES+=BOOST_NO_AUTO_PTR
<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;background:#e0e0e0;'>@@ -1392,9 +1395,6 @@ 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid unnecessary dependency on OpenSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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 021afdc..e91e1b0 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;'>@@ -312,7 +312,7 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtmacextras {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1356,6 +1356,9 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/56615
# see https://bugreports.qt.io/browse/QTBUG-67810
patchfiles-append patch-qtlocation-no-cxx17.diff
<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;background:#e0e0e0;'>@@ -1378,9 +1381,6 @@ 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid unnecessary dependency on OpenSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "QMAKE_LIBS_OPENSSL="
</span> }
# special case
</pre><pre style='margin:0'>
</pre>