<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c7a773046fd088bdfff557277384b28099f94406">https://github.com/macports/macports-ports/commit/c7a773046fd088bdfff557277384b28099f94406</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c7a773046fd088bdfff557277384b28099f94406
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Feb 17 05:46:51 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: add openssl variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some users might not want to use OpenSSL because
</span><span style='display:block; white-space:pre;color:#404040;'> of licensing issues with GPL.
</span><span style='display:block; white-space:pre;color:#404040;'> See https://lists.macports.org/pipermail/macports-dev/2017-January/thread.html#35234
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/53369
</span><span style='display:block; white-space:pre;color:#404040;'> See http://doc.qt.io/qt-5/qtnetwork-index.html#licenses-and-attributions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some users may have LibreSSL installed, which conflicts with OpenSSL
</span><span style='display:block; white-space:pre;color:#404040;'> and is currently incompatible with Qt.
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/51358
</span>---
aqua/qt5/Portfile | 37 ++++++++++++++++++++++++++++++-------
aqua/qt55/Portfile | 32 +++++++++++++++++++++++++-------
2 files changed, 55 insertions(+), 14 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 24d3f81..3e0cd66 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;'>@@ -46,9 +46,6 @@ foreach test_qt_name ${available_qt_versions} {
</span> }
}
<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;'>-conflicts-append libressl libressl-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,12 +130,12 @@ array set modules {
</span> 55b2d2d9474cb565e872eed1ab0e8e01bf5031a8
2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus path:lib/libssl.dylib:openssl port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
</span> ""
{"Qt Gui" "Qt Widgets" "Qt Print Support" "Qt OpenGL" "Qt Core" "Qt XML" "Qt SQL" "Qt Network" "Qt Test" "Qt D-Bus" "Qt Concurrent" "Qt Platform Headers"}
""
"variant overrides: ~docs"
<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;'>@@ -610,6 +607,17 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt uses TLS protocols introduced in OS X 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://developer.apple.com/reference/security/sslprotocol/ktlsprotocol11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://developer.apple.com/reference/security/sslprotocol?language=objc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} == 11 && ![variant_isset openssl] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "using Secure Transport requires OS X 10.8 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "please use openssl variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible variant choice"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://codereview.qt-project.org/#/c/141654/
patchfiles-append patch-add_sdk.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,6 +649,11 @@ foreach {module module_info} [array get modules] {
</span> # When testing, ensure that a universal object file is not inadvertently created.
patchfiles-append patch-machtest.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prior to 10.8, CFNetwork was part of CoreServices
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qnetworkproxy_mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -792,7 +805,7 @@ foreach {module module_info} [array get modules] {
</span> -system-libjpeg \
-system-freetype \
-system-harfbuzz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -openssl-linked \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-openssl \
</span> -no-libproxy \
-system-pcre \
--disable-xcb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -843,7 +856,8 @@ foreach {module module_info} [array get modules] {
</span>
# MacOS/iOS options:
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -securetransport
</span>
if {${configure.sdkroot} ne ""} {
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -928,6 +942,15 @@ foreach {module module_info} [array get modules] {
</span> configure.args-replace -no-gstreamer {-gstreamer 1.0}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant openssl description {Use OpenSSL instead of Secure Transport} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -securetransport -no-openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -openssl-linked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/51358
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append libressl libressl-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# these subports use qmake
PortGroup qmake5 1.0
<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 50312ff..97e4df4 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;'>@@ -45,9 +45,6 @@ foreach test_qt_name ${available_qt_versions} {
</span> }
}
<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;'>-conflicts-append libressl libressl-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,12 +129,12 @@ array set modules {
</span> ce4bccd0703aaf8d904fbecd1f334ef13d698a44
dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus path:lib/libssl.dylib:openssl port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
</span> ""
{"Qt Gui" "Qt Widgets" "Qt Print Support" "Qt OpenGL" "Qt Core" "Qt XML" "Qt SQL" "Qt Network" "Qt Test" "Qt D-Bus" "Qt Concurrent" "Qt Platform Headers"}
""
"variant overrides: ~docs"
<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;'>@@ -592,6 +589,17 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt uses TLS protocols introduced in OS X 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://developer.apple.com/reference/security/sslprotocol/ktlsprotocol11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://developer.apple.com/reference/security/sslprotocol?language=objc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} == 11 && ![variant_isset openssl] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "using Secure Transport requires OS X 10.8 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "please use openssl variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible variant choice"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://codereview.qt-project.org/#/c/141654/
patchfiles-append patch-add_sdk.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -785,7 +793,7 @@ foreach {module module_info} [array get modules] {
</span> -system-libjpeg \
-system-freetype \
-system-harfbuzz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -openssl-linked \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-openssl \
</span> -no-libproxy \
-system-pcre \
--disable-xcb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -834,7 +842,8 @@ foreach {module module_info} [array get modules] {
</span>
# MacOS/iOS options:
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -framework \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -securetransport
</span>
if {${configure.sdkroot} ne ""} {
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -919,6 +928,15 @@ foreach {module module_info} [array get modules] {
</span> configure.args-replace -no-gstreamer {-gstreamer 1.0}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant openssl description {Use OpenSSL instead of Secure Transport} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -securetransport -no-openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -openssl-linked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/51358
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append libressl libressl-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# these subports use qmake
PortGroup qmake5 1.0
</pre><pre style='margin:0'>
</pre>