<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/c0c7732d0a187e539b5c3e3a40a06da5a44dbb0d">https://github.com/macports/macports-ports/commit/c0c7732d0a187e539b5c3e3a40a06da5a44dbb0d</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 c0c7732 qt5*: use compatibility OpenSSL for Qt < 5.10
</span>c0c7732 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c0c7732d0a187e539b5c3e3a40a06da5a44dbb0d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Mar 18 11:50:22 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: use compatibility OpenSSL for Qt < 5.10
</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/58204
</span>---
aqua/qt55/Portfile | 9 +++++----
aqua/qt56/Portfile | 9 +++++----
aqua/qt57/Portfile | 9 +++++----
aqua/qt58/Portfile | 9 +++++----
aqua/qt59/Portfile | 9 +++++----
5 files changed, 25 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf112c3..3105880 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +152,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 12"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 13"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1097,9 +1097,10 @@ foreach {module module_info} [array get modules] {
</span> configure.args-delete -securetransport -no-openssl
configure.args-append -openssl-linked
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/51358
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for why not a path dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/58204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openssl10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 40e159a..2db8b1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +158,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 5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 6"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1144,9 +1144,10 @@ foreach {module module_info} [array get modules] {
</span> configure.args-delete -securetransport -no-openssl
configure.args-append -openssl-linked
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/51358
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for why not a path dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/58204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openssl10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fb5124..0f44513 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,7 +160,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 5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 6"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1223,9 +1223,10 @@ foreach {module module_info} [array get modules] {
</span> configure.args-delete -securetransport -no-openssl
configure.args-append -openssl-linked
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/51358
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for why not a path dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/58204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openssl10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 724fa47..27a7f96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +158,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 4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 5"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1213,9 +1213,10 @@ foreach {module module_info} [array get modules] {
</span> configure.args-delete -securetransport -no-openssl
configure.args-append -openssl-linked
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/51358
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for why not a path dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/58204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openssl10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
<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 6902453..26015c5 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;'>@@ -162,7 +162,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;'>@@ -1199,9 +1199,10 @@ foreach {module module_info} [array get modules] {
</span> configure.args-delete -securetransport -no-openssl
configure.args-append -openssl-linked
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/51358
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for why not a path dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/58204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openssl10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -I${prefix}/include/openssl-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/openssl-1.0
</span> }
default_variants-append +openssl
</pre><pre style='margin:0'>
</pre>