<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/fd4e329a25e85ba8f91666b794e6de8a23237c02">https://github.com/macports/macports-ports/commit/fd4e329a25e85ba8f91666b794e6de8a23237c02</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fd4e329a25e85ba8f91666b794e6de8a23237c02
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Feb 17 06:23:25 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: ensure C++-11 support for all supported OSs
</span>---
aqua/qt5/Portfile | 83 +++++++++++++++++++++++++++++-------------------------
aqua/qt55/Portfile | 76 ++++++++++++++++++++++++++++---------------------
2 files changed, 89 insertions(+), 70 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 881e4e0..abac8b9 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;'>@@ -25,6 +25,9 @@ unset just_want_qt5_variables
</span> set branch [join [lrange [split ${version} .] 0 1] .]
set qt_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt builds differently when it detects C++-11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> master_sites \
http://download.qt.io/official_releases/qt/${branch}/${version}/submodules \
http://download.qt.io/community_releases/${branch}/${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +126,7 @@ array set modules {
</span> {"Qt3D Core" "Qt3D Input" "Qt3D Logic" "Qt3D Renderer"}
"technology preview modules"
"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: "
}
qtbase {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,7 +138,7 @@ array set modules {
</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 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,7 +150,7 @@ array set modules {
</span> {"Qt Canvas 3D"}
""
"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: "
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +162,7 @@ array set modules {
</span> {"Qt Bluetooth" "Qt NFC"}
""
"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: "
}
qtenginio {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,7 +174,7 @@ array set modules {
</span> {"Enginio"}
""
"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: "
}
qtdeclarative {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,7 +186,7 @@ array set modules {
</span> {"Qt QML" "Qt Quick" "Qt Quick Widgets"}
""
"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: "
}
qtdoc {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,7 +198,7 @@ array set modules {
</span> {"Qt Reference Documentation"}
"requires all documentation"
"variant overrides: ~examples ~tests ~debug noarch ~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: "
}
qtgraphicaleffects {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,7 +210,7 @@ array set modules {
</span> {"Qt Graphical Effects"}
""
"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: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,7 +222,7 @@ array set modules {
</span> {"Qt Image Formats"}
""
"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: "
}
qtlocation {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,7 +234,7 @@ array set modules {
</span> {"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;'>@@ -243,7 +246,7 @@ array set modules {
</span> {"Qt Mac Extras"}
""
"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: "
}
qtmultimedia {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -255,7 +258,7 @@ array set modules {
</span> {"Qt Multimedia" "Qt Multimedia Widgets"}
""
"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: "
}
qtquickcontrols {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,7 +270,7 @@ array set modules {
</span> {"Qt Quick Controls" "Qt Quick Dialogs" "Qt Quick Layouts" "Qt Quick Extras"}
""
"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: "
}
qtquickcontrols2 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,7 +282,7 @@ array set modules {
</span> {"Qt Labs Controls"}
"technology preview module"
"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: "
}
qtscript {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -291,7 +294,7 @@ array set modules {
</span> {"Qt Script" "Qt Script Tools"}
"deprecated in favor QJS* in Qt QML"
"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: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -303,7 +306,7 @@ array set modules {
</span> {"Qt Sensors"}
""
"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: "
}
qtserialbus {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,7 +318,7 @@ array set modules {
</span> {"Qt Serial Bus"}
"technology preview module"
"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: "
}
qtserialport {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,7 +330,7 @@ array set modules {
</span> {"Qt Serial Port"}
""
"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: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,7 +342,7 @@ array set modules {
</span> {"Qt SVG"}
""
"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: "
}
qttools {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,7 +354,7 @@ array set modules {
</span> {"Qt Help" "Qt UI Tools" "Qt Designer"}
""
"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: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -363,7 +366,7 @@ array set modules {
</span> {"translation files"}
""
"variant overrides: ~examples ~tests ~debug noarch ~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: "
}
qtwebchannel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -375,7 +378,7 @@ array set modules {
</span> {"Qt WebChannel"}
""
"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: "
}
qtwebengine {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -387,7 +390,7 @@ array set modules {
</span> {"Qt WebEngine" "Qt WebEngine Widgets"}
"very large and relatively new; requires newer version of OS X"
"variant overrides: ~universal"
<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: "
}
qtwebkit {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,7 +402,7 @@ array set modules {
</span> {"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"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: "
}
qtwebsockets {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,7 +414,7 @@ array set modules {
</span> {"Qt WebSockets"}
""
"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: "
}
qtwebview {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -423,7 +426,7 @@ array set modules {
</span> {"Qt WebView"}
"new in 5.6.0; requires qtwebengine"
"variant overrides: ~universal"
<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: "
}
qtxmlpatterns {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -435,7 +438,7 @@ array set modules {
</span> {"Qt XML Patterns"}
""
"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: "
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -452,7 +455,7 @@ array set modules {
</span> #
###############################################################################
array set sql_plugins {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {sqlite SQLite "revision 0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {sqlite SQLite "revision 1"} {
</span> {
"sqlite3"
"port:sqlite3"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,7 +464,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {psql PostgreSQL "revision 0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {psql PostgreSQL "revision 1"} {
</span> {
"postgresql95"
"port:postgresql95"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -484,7 +487,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {mysql MySQL "revision 0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {mysql MySQL "revision 1"} {
</span> {
"mariadb55"
"port:mariadb"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -709,8 +712,19 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-mkspecs.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set replace_cxx_stdlib ${cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see cxx11 PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set replace_cxx_stdlib "macports-libstdc++ -D_GLIBCXX_USE_CXX11_ABI=0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set replace_cxx_stdlib "macports-libstdc++"
</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> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__CXX_STDLIB__|${cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS__CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1089,8 +1103,6 @@ foreach {module module_info} [array get modules] {
</span> # special case
if { ${module} eq "qtwebkit" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # use MacPorts icu
#
# qmake uses pkgconfig to look for icu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1196,11 +1208,6 @@ foreach {module module_info} [array get modules] {
</span> }
# special case
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${module} eq "qtserialbus" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # special case
</span> if { ${module} eq "qtconnectivity" } {
# https://codereview.qt-project.org/#/c/172619/
patchfiles-append patch-qtconn-for-10.12.diff
<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 cb3325b..56a2a4b 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;'>@@ -25,6 +25,9 @@ unset just_want_qt5_variables
</span> set branch [join [lrange [split ${version} .] 0 1] .]
set qt_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt builds differently when it detects C++-11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> master_sites \
http://download.qt.io/archive/qt/${branch}/${version}/submodules
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,7 +125,7 @@ array set modules {
</span> {"Qt3D Core" "Qt3D Input" "Qt3D Logic" "Qt3D Renderer"}
"technology preview modules"
"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: "
}
qtbase {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +137,7 @@ array set modules {
</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 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +149,7 @@ array set modules {
</span> {"Qt Canvas 3D"}
""
"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: "
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +161,7 @@ array set modules {
</span> {"Qt Bluetooth" "Qt NFC"}
""
"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: "
}
qtenginio {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,7 +173,7 @@ array set modules {
</span> {"Enginio"}
""
"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: "
}
qtdeclarative {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,7 +185,7 @@ array set modules {
</span> {"Qt QML" "Qt Quick" "Qt Quick Widgets"}
""
"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: "
}
qtdoc {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,7 +197,7 @@ array set modules {
</span> {"Qt Reference Documentation"}
"requires all documentation"
"variant overrides: ~examples ~tests ~debug noarch ~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: "
}
qtgraphicaleffects {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,7 +209,7 @@ array set modules {
</span> {"Qt Graphical Effects"}
""
"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: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,7 +221,7 @@ array set modules {
</span> {"Qt Image Formats"}
""
"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: "
}
qtlocation {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -230,7 +233,7 @@ array set modules {
</span> {"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;'>@@ -242,7 +245,7 @@ array set modules {
</span> {"Qt Mac Extras"}
""
"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: "
}
qtmultimedia {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,7 +257,7 @@ array set modules {
</span> {"Qt Multimedia" "Qt Multimedia Widgets"}
""
"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: "
}
qtquick1 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,7 +269,7 @@ array set modules {
</span> {"Qt Declarative"}
"deprecated"
"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: "
}
qtquickcontrols {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,7 +281,7 @@ array set modules {
</span> {"Qt Quick Controls" "Qt Quick Dialogs" "Qt Quick Layouts" "Qt Quick Extras"}
""
"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: "
}
qtscript {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -290,7 +293,7 @@ array set modules {
</span> {"Qt Script" "Qt Script Tools"}
"deprecated in favor QJS* in Qt QML"
"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: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -302,7 +305,7 @@ array set modules {
</span> {"Qt Sensors"}
""
"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: "
}
qtserialport {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,7 +317,7 @@ array set modules {
</span> {"Qt Serial Port"}
""
"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: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,7 +329,7 @@ array set modules {
</span> {"Qt SVG"}
""
"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: "
}
qttools {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -338,7 +341,7 @@ array set modules {
</span> {"Qt Help" "Qt UI Tools" "Qt Designer"}
""
"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: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -350,7 +353,7 @@ array set modules {
</span> {"translation files"}
""
"variant overrides: ~examples ~tests ~debug noarch ~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: "
}
qtwebchannel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -362,7 +365,7 @@ array set modules {
</span> {"Qt WebChannel"}
""
"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: "
}
qtwebengine {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,7 +377,7 @@ array set modules {
</span> {"Qt WebEngine" "Qt WebEngine Widgets"}
"very large and relatively new; requires newer version of OS X"
"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: "
}
qtwebkit {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -386,7 +389,7 @@ array set modules {
</span> {"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"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: "
}
qtwebkit-examples {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -398,7 +401,7 @@ array set modules {
</span> {"examples for Qt WebKit"}
"deprecated in favor of Qt WebEngine; doen't provide functionality"
"variant overrides: ++examples ~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: "
}
qtwebsockets {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -410,7 +413,7 @@ array set modules {
</span> {"Qt WebSockets"}
""
"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: "
}
qtxmlpatterns {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -422,7 +425,7 @@ array set modules {
</span> {"Qt XML Patterns"}
""
"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: "
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -439,7 +442,7 @@ array set modules {
</span> #
###############################################################################
array set sql_plugins {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {sqlite SQLite "revision 0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {sqlite SQLite "revision 1"} {
</span> {
"sqlite3"
"port:sqlite3"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -448,7 +451,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {psql PostgreSQL "revision 0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {psql PostgreSQL "revision 1"} {
</span> {
"postgresql95"
"port:postgresql95"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -471,7 +474,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {mysql MySQL "revision 0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {mysql MySQL "revision 1"} {
</span> {
"mariadb55"
"port:mariadb"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -698,8 +701,19 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-mkspecs.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set replace_cxx_stdlib ${cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see cxx11 PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set replace_cxx_stdlib "macports-libstdc++ -D_GLIBCXX_USE_CXX11_ABI=0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set replace_cxx_stdlib "macports-libstdc++"
</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> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__CXX_STDLIB__|${cxx_stdlib}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS__CXX_STDLIB__|${replace_cxx_stdlib}|g" \
</span> ${worksrcpath}/mkspecs/common/clang-mac.conf
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1075,8 +1089,6 @@ foreach {module module_info} [array get modules] {
</span> # special case
if { ${module} eq "qtwebkit" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # use MacPorts icu
#
# qmake uses pkgconfig to look for icu
</pre><pre style='margin:0'>
</pre>