<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/2d768f02bf908e86e0ba34ba56cf155d9d76033c">https://github.com/macports/macports-ports/commit/2d768f02bf908e86e0ba34ba56cf155d9d76033c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2d768f02bf908e86e0ba34ba56cf155d9d76033c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 9 07:50:29 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: update version 5.12.5->5.13.2
</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/58841
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 22 +-
aqua/qt5/Portfile | 265 ++++++++++-----------
aqua/qt5/files/patch-pc_files.diff | 2 +-
.../patch-qtmultimedia_no_macports_openal.diff | 2 +-
aqua/qt5/files/patch-qtwebengine_1015_sdk.diff | 199 ----------------
.../patch-qtwebengine_forward_declarations.diff | 10 +-
aqua/qt5/files/patch-qtwebengine_tests.diff | 16 +-
aqua/qt5/files/patch-tst_benchlibcallgrind.diff | 14 --
8 files changed, 166 insertions(+), 364 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b375f7f..6e809df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@
</span>
global available_qt_versions
array set available_qt_versions {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5 {qt5-qtbase 5.12}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5 {qt5-qtbase 5.13}
</span> qt511 {qt511-qtbase 5.11}
qt59 {qt59-qtbase 5.9}
qt58 {qt58-qtbase 5.8}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,6 +115,7 @@ proc qt5.get_default_name {} {
</span> #
# macOS Sierra (10.12)
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.13: Supported
</span> # Qt 5.12: Supported
# Qt 5.11: Supported
# Qt 5.10: Supported
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,6 +129,7 @@ proc qt5.get_default_name {} {
</span> #
# macOS High Sierra (10.13)
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.13: Supported
</span> # Qt 5.12: Supported
# Qt 5.11: Supported
# Qt 5.10: Supported
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,10 +140,20 @@ proc qt5.get_default_name {} {
</span> #
# macOS Mojave (10.14)
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.13: Supported
</span> # Qt 5.12: Supported
#
return qt5
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.major} == 19 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS Catalina (10.15)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.13: Not Supported but seems to work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.12: Not Supported but seems to work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span> } else {
#
# macOS ??? (???)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,7 +321,7 @@ namespace eval qt5pg {
</span> }
qtcanvas3d {
5.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.13
</span> libexec/qt5/qml/QtCanvas3D/libqtcanvas3d.dylib
""
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -379,6 +391,12 @@ namespace eval qt5pg {
</span> lib/pkgconfig/Qt5Location.pc
""
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtlottie {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/cmake/Qt5Bodymovin/Qt5BodymovinConfig.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtmacextras {
5.2
6.0
<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 44d5ee5..bfa42e1 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;'>@@ -13,7 +13,7 @@ license {LGPL-3 GPL-3 OpenSSLException}
</span>
homepage https://www.qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.12.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.13.2
</span> set middle_name everywhere
if { ${subport} eq "${name}-qtwebkit" ||
${subport} eq "${name}-qtwebkit-examples" ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> # port provides `find ./ -name \*.dylib -exec otool -L {} \; | grep /opt/local/libexec/qt5 | cut -d ' ' -f1` | cut -d : -f2 | sort -u
# port provides `find ./ -name \*.dylib -exec otool -L {} \; | grep /opt/local/lib/ | cut -d ' ' -f1` | cut -d : -f2 | sort -u
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.13
</span> #
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,15 +125,15 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> # license replacement
# }
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# module info found at https://doc.qt.io/qt-5.12/qtmodules.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module info found at https://doc.qt.io/qt-5.13/qtmodules.html
</span> #
###############################################################################
array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 416579f4d958d2a32a37a17b5675291f13e6d7e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2a35b144768c7ad8a9265d16a04f038d9bc51016bd2c4b2b516e374f81ff29c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 82075068
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 44ace68d9969a6aa2f7996383fc6950f56fe462d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d1b9fc0be82264b5f76c3a5330901dff95c1f2bcb67916c3fac6bad4ff69adc9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81537856
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,9 +146,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bd49b61600b12e4dcb80b10c9cfa678c08a05c6c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fc8abffbbda9da3e593d8d62b56bc17dbaab13ff71b72915ddda11dabde4d625
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 48463288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 94749bf68e78cf3e3fa84a8df73910b501869293
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 48735704
</span> }
""
"port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz port:double-conversion"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,29 +156,14 @@ 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:#ffe0e0;'>- "License: "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtcanvas3d {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a45a6054de1723a1d635fe687a10ee4f415e3b38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1553e06ce3cc5afb36aed3698b85c00e734eac07f7f41895426bebd84216d80c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10914944
</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;'>- ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtdeclarative"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Qt Canvas 3D"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "variant overrides: "
</span> "revision 0"
"License: "
}
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3dca2ab2515f5521c7920e3628d871091cc2f299
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4c7c30a916ba0100a1635b89f48bc5a8af4cdedac79c3fc18456af54dc0a6608
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4243464
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 37bc5548361ff55cefcc472e9eddd25826119992
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3bad81c3cfb32cf72fb0ce2ac2794d031cf78a3902b4715f89c09b2d0e041e87
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4244092
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,9 +176,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8a04d9e0a39a2cc6d81c2caecd8705fa96d559da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bdf62c72d689f47c4d17ecdde934d9f85a1164091e58fce02873de259e8de88b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2752252
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5001272b8ba4bf8ca0699a71a160bf99808dcc51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 644e234eb64f602ef5cdeb8802ef9b58e75478f1124f001937275d62ed692e17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2777504
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,9 +191,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0cb2a871f01d81eefa458391941be8deb0e4027b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1de165bf5330c7fb18c6fbb8c0e5cda47fa19c2eaba657b3792fd75e653444f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5200204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f9b6d842aed45aa64a51edd39721e7a76332f52c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ecf934c3eb07173505781734f95cfc2cf9d89e6b1b98516ac98a137797f4ef28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5182216
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,9 +206,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 539a292c3f40a4bd9456ea6164b2802e0ca524ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 22c5323d4b01259e6e352eef1b54129d6dfee00a406f0312905fa7db322b9190
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 20512492
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0ffe0f6c54cfb6ae8d05b9d1023a2b29bcf62c25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d9a524f45fe9e136cda2252f9d7013ec17046d907e3f39606db920987c22d1fd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 20940748
</span> }
"port:python27"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,9 +221,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 26d00727d303c684fd37916236166a58ab1e6dd6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f1de30227b8854c284e9c23e9c0c44d9fe768880aef826b0f880a44dd7c7538d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5648572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c15972fa405ae8f8cd2dfb77b442168a863de15a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be09543143d5dca984d2c2d9085751317e7a95b78fdbe9b6a30f2faa03543e46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5747084
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,9 +236,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 76707b8113ee6183060703d980602d535f0efc77
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- de88f01d47f7cc5d54a1af783c5fae9f2b0101948ff33b8290f71b2657aded33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 385864
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7323d110e3090bc189c0b5a05d5737514dc2f4c2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75164885433e36a90b557aa7f319ff3d6278c3616469f67b42dda6eb8b92e76e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 386668
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,9 +251,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 52149f6f3e732422d8a5833616fea0be532d7e18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bdbddba7e0e0d041809a98d97c07da8be8936ec48537335cbaea9b0049c646ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14271472
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5740edaf153498882157449602c74171937a58ab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 297a89bb6c771f849c4ce866e5c98dadf665163b3dab03bc48a58f51424e7e66
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14845928
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,9 +266,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e7b5a6e80611f5a1c5633348579dea603fd72c84
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9f19394830542fb9e6bde6806b6216b7207f96bff674b91e8e8a8f89699e1f0a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1795824
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b9118a89a786418f8227981674a3d1ce80b62713
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6968649fdccc7d633cf9ada25f1bdaf0a2fb45a214d58c2c47896166d4553ac0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1803796
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,9 +281,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2432ef0eb0074a58d5c4b6e99fc59acf34597e66
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 12c8b59755abc4ca56e135e8ae3db7c6ba1bd95c779060f10a01393ae1040122
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5905880
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 69484f3b23039dfc94a52ef9adac79ade1e1afbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5fe4b824d3dc6c800682ff986333ec09edb9c27582066e928b1862b4d58212e3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6050044
</span> }
""
"port:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -306,14 +291,29 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtlottie {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be5e31c30b35d25841c8da4ac3f69884d7779ec5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ af9a10aaa110767ffd88e02cb8ad0a3930ccfeb61f0c125afbf3791136d36253
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 82052
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"A QML API for rendering graphics and animations in JSON format"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "technology preview module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "License: {GPL-3 OpenSSLException}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 24055815a7e6dd879e94477ceac809871d429aaf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 984c3c95834aaa6fd85234ab1987a79662911c510e419611ce88fb4756313194
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 68808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b816c248bca3a3576dde2a79f1f124e9e9059694
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 545ede0783ebc2405c6efa6ed0b2b7147a1d7e60eb7fcb853abfca0a9cb65ed5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 69164
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,9 +326,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 76d55cf62cf5203c181d1648b7e8ebca64d4b900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d5a0a4fddc5ef14d641160a1fc0011b190ff8d9f19009498d586516b8ee3479c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3744764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6b6f99e01c307b260bb1c8d906a27e67e1c81e7b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5f885459d46ea2f2bb24597678befd4913d8f88029730d01984f51f9c367b9f4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3820660
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,9 +341,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 20e8e9c7321622b0843e5e55f379a5d8e10a6f86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0933475a2d30550c70ce4026c72678cbfdac73211593c78d442e038ef531a9f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 139116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 95b35ac7e7d619c71056e5961bbb71de414026c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6326943e5c1a3e6eac8dcc44d088f1a3d1c45d14100ff1e95f833b0463243af3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 141172
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -356,9 +356,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8f24bb1e85b1eb7149b37b4a6eef2565cd520879
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7bcebc4985d387f3fa4ffcc19eada1f4f0f000ed0fd3e1d1dc37eb1db0be615b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 207960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e4fcdeecfaa2ea185557dd76cd83b7329c74dadc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e9ef800b7d79f660c72f7024f82a2915b1111b47417f93c3dc2354b9bf307ff4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 208096
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,9 +371,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dbacfae65be58269bba34a075da78ae39c187d64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 46deaefbdac3daa576c748e807956f5f82b2318923b1a36e434a3ff32d1d2559
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6056164
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5c4fa9e83cede4e873c23172502a36d22936062e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d6e64d8db13ada55fcb0d5e8ca26097085680087d931435c6c6db859d87493ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5955448
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -386,9 +386,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5ce5c1534caf03e5c5b1c9ecf44e38f38134d48c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d744bdc492486db6cb521b1d4891e2358719399825ca1cf2a50968a80f6acb8f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9299520
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75863e6ec38e4e5319efc3a8c4fccfcceeabddf6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 90ee8be7b66cc65f3f22e71a0b35adab5c169ac4f8ebc6f9e7685228bf8a7d70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9252912
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -401,9 +401,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5e2fa24bc1478f4a6b81f83ec9128ba8034ec0c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- acf131af93dd1fefbf30c7e03e29b8a1da3180e00c49f95c14a1cb6158cfeacd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 346152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 20097626c8ea2d6cf8de9b318e45bd716f597869
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bd24db9d2bb08ae7955291af52ee7510aa193d0f72ed0e3ff74f7cf7e81f4d65
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 367032
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -416,9 +416,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0957b17b4a210d1a4377d42e158571ed915abd85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0083734ae827840334b774decb15de37f1b4ea5c88e442e2f485c530f24f1df4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2675432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 71e26d3b2ce11bfa51d0748ff2e73983e33c26f3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3d92691c25577fbf7511d40253de0cd9d31444ea5a0aa860f65efb9fa0f3ce70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2696452
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,14 +426,14 @@ 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 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 073bfc5c16bd20d714b1cdf802b74453720a04b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6f1ec74100cdb2e7dfc3535e09d356fc53ba42e61b32fc3b93d5a7efed49960c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 434260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a77625982d484e0ca8a43f986522788f769318f0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e489dff21e18c1e7f72ffd31af82404f845bd90824c6b978140591366398a9d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 435428
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -446,9 +446,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 85b04faa2ed2f09443a8fdd27d27409702590b6b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e3a86a706f475bb23fc874de56026482de223ebd24f8cb4e94a28d1985ca0b85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2035484
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8e722c909dfdf14df32fbe93e4ec8d227cf13297
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 46f73bbfddfd78a419c6424d6839318774b84c955a7f7a96c12c590f6d8fb177
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2046708
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,9 +461,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b89b72589137eb655a10d346527c3952e9269080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8474ae61a703c56e327ae0755c27643f2eafe0d915e8c6afb21728548dc02c22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 329052
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2ff0ed6d010569251cfa0937c74bf7bbf28c1bc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 48159393b1368976b5324eac48424e2a6e5d63c783194d0576a978151f882da3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 338428
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,9 +476,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ed2e60e0e7e0868a25073fd4d4c021c2248f7e71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f8ef0321a59ecfe2c72adc2ee220e0047403439a3c7b9efb719b1476af1fb862
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 302940
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7238c5988a02b6ea2c9d2e01e37614fe362c7e38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7677ffc1dce3b75c0a98d07d215588a8dccb5c276c55b4ecd60c35ed1c89cb34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 310736
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,9 +491,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4d1fc70b6f6b266d99325ce3f1f12c4a16e7391b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f94c0cd7236d1a20d97d314d2c17c45c967cd7f24b869c43f5f46253f436f25b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 99840
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8f41ce8fec774203e5bbf9ef59748d3ae3d42239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a0aca08feeac6925ead7f841319bdcfd60bfc126de07807edaf267c2ca8d13d5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 100312
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,9 +506,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 075a1c3b948c4081a24a33a79b4a76da6de7a1f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 75a791cf749f671d7ea9090b403ca513f745795018db512e7eecbf418b679840
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1860340
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8bc01bd283fe156a09e594ee432c30ee74ce8ab6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 849e2e357e1333b64ecb728352f652cd8d916f029ed848f775b15d0b500cb7d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1890380
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,9 +521,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b316528a06fe79b41fc4cc40b2ee7d2c39eae926
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 28e095047b4985437dd66120cbcb49ac091bf4f12576ecad7ebc781b7dd44025
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9759888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a5b422b534c00437a9adb1cfe4ccb7afd2e8854a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9110256
</span> }
""
"port:clang-9.0"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -531,14 +531,14 @@ array set modules {
</span> {"Qt Designer" "Qt Help" "Qt UI Tools"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b6afc7a69e2069a2a2a6f84c631a03db8e2f4133
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 72eb6317190fdcc3f8de37996adc646ab8772988766bacaab60a5bcc7d6a3f2a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1377740
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4bd7a4da9034603ec6de5f72aca2e3188720f876
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1365880
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -551,9 +551,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 246b6859985ff9cc46a68902d59827ec76dbe8f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 786d745b34b1f145073488d492325e98bcde81b07ab984032ea5eb2fb52e6e5e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10911944
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ abd0f990c262ac13e7f0e0ad9cc372f9878437d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8e368dde237d21666f6cc8512a060e205388e519a4d7559c0505cc75224ed62b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10923292
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,9 +566,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8ccef00c11f62c004a2e21038b99d3ed0cc4e87e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9f1d1ac20722ee053ecf071d4ec0070a45a765cb67b6e31add61004fb4b3c5e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 182944
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 624790b4ce487ff62e5ca4db2bdf94aa4f7638bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f452d419d8b19b566835f316bbf282dabc8b1c2a74c9c98c1aec4184465e9c13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 192652
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,9 +581,9 @@ array set modules {
</span> }
qtwebengine {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 38406181b27efae1d45658e7a4494de3387d2786
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 31881130e69eb8336e9480f9f33cd5a93e86de8d7323c0ae1893e1a72ce70743
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 249295448
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ db36dd8fade1ea196e273304855292df46e3f24e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 255593964
</span> }
"port:python27 port:py27-ply port:ninja port:gperf port:bison port:flex"
"port:fontconfig port:dbus port:harfbuzz path:lib/pkgconfig/glib-2.0.pc:glib2 port:zlib port:minizip port:libevent port:libxml2 port:jsoncpp port:protobuf3-cpp port:poppler port:pulseaudio port:icu path:lib/libavcodec.dylib:ffmpeg port:libopus port:webp port:libpng port:lcms2 port:freetype port:re2 port:snappy"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -591,14 +591,14 @@ array set modules {
</span> {"Qt WebEngine"}
"very large and relatively new"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c06565ede6c8e01e3254211126bab2feb9eae474
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aac3b2b2e5b6f26dd7abba6eab616777fecbb4d06de05ddab68c1296652bc4f7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 73400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 95daeefa4fe3b98994dcc0218efb6180e472e7ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ae369929d5a3356391bccd25cac22846dc44cbb726ce7b60924f53944addabb7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 73608
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,9 +641,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 81b385edb8e00ffb3e98a16f4e0e344a58476749
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5d58e697c49c0ea19a8299deba84b5360dca8c336a1636d38de0351757293262
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 235468
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 985bd55daed9c4f99af165986379a40532e477fc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fc11236c8bf69b27a4e237a27b9ea27fc90d8c25d81d1d451ce3a0b63cbc02d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 244668
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -656,9 +656,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9d318dd29f116a42622c3cc26939302eeb7f924b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a6d4d8c335cd6838f4638874fcd67655e80db569ed567a774a84f6bf7d332f26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 131160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 44df0e0dc744c1018529a5c9b4ac88689e81949c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 394cc7a9cb29b7883816ff3137b022f30568151aada0739fc99a23789c21c015
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 131168
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -671,9 +671,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0d842442f3e961dbffd9371a0e33d30fd79bf57b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b905d9107f87798ef0f142942fc45c0f63fc113522ab041e791d3cb744a8babd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1390052
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d0be90cf4c12d789731b5a1cbdb86992c0b811ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1e87d8c004ec0beea3b29d13f0964c563aa9fae51c392c998750ca4e386374e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1392192
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -867,10 +867,6 @@ foreach {module module_info} [array get modules] {
</span> # See the files mkspecs/features/qt_module.prf and qmake/generators/makefile.cpp
patchfiles-append patch-pc_files.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # only runs test code on 32-bit systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-tst_benchlibcallgrind.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # find the Rez program
patchfiles-append patch-find_rez.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1459,6 +1455,7 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtwebengine" } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup conflicts_build 1.0
</span> # see https://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
minimum_xcodeversions {16 8.3.3}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1474,16 +1471,16 @@ foreach {module module_info} [array get modules] {
</span> build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Undefined symbols for architecture x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build-append ${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # either have VNRequest forward declarations or include correct header file
patchfiles-append patch-qtwebengine_forward_declarations.diff
# do not opportunistically find MacPorts libraries (e.g. X11 libraries)
patchfiles-append patch-qtwebengine_tests.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/59386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://bugreports.qt.io/browse/QTBUG-78997
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_1015_sdk.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://trac.macports.org/ticket/59294
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1517,7 +1514,7 @@ foreach {module module_info} [array get modules] {
</span> }
variant gstreamer description {Compile GStreamer support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gstreamer1 port:gstreamer1-gst-plugins-base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gstreamer1 port:gstreamer1-gst-plugins-base port:gstreamer1-gst-plugins-bad
</span> }
# for commands must follow -spec set in PortGroup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1757,7 +1754,7 @@ subport ${name}-docs {
</span> if { ${subport} eq ${name} } {
# the main port is Meta-port to install various modules
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
description Qt Tool Kit ${qt_major}
long_description Qt Tool Kit: A cross-platform framework \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-pc_files.diff b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a0ccf53..37a3564 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- qmake/generators/makefile.cpp.orig 2018-12-03 04:15:26.000000000 -0700
+++ qmake/generators/makefile.cpp 2018-12-22 06:02:13.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3403,7 +3403,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3426,7 +3426,7 @@
</span> t << "-I${includedir}";
if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
&& libDir != QLatin1String("/Library/Frameworks")) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff b/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 192bb49..e336d52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtmultimedia_no_macports_openal.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/multimedia/configure.json.orig 2017-06-22 23:32:22.000000000 -0700
+++ src/multimedia/configure.json 2017-08-28 05:37:24.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +125,7 @@
</span> "label": "OpenAL",
"test": "openal",
"sources": [
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_1015_sdk.diff b/aqua/qt5/files/patch-qtwebengine_1015_sdk.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f5ef738..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_1015_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,199 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From be2b74f4ab835573362a012047c76508973bd065 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Peter Varga <pvarga@inf.u-szeged.hu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 04 Oct 2019 11:25:07 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [Backport][ios] Get things compiling on Xcode 11.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Updates various files with to conform to iOS13 SDK headers changes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Nullability and availability changes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Updates security types
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Updated default values (modalPresentationStyle)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Updates objc_zombie with IMP changes (as well as adding the accidentally-omitted tests)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Task-number: QTBUG-78997
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: I949717fbe3823a7d867b2b854f05d52f20478ea6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Commit-Queue: Justin Cohen <justincohen@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Mark Mentovai <mark@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Mark Cogan <marq@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: edchin <edchin@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Cr-Commit-Position: refs/heads/master@{#666142}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Dmitriy Kuminov <coding@dmik.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
</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;'>-diff --git a/chromium/base/mac/foundation_util.h b/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b2d56d8..8626046 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef BASE_MAC_FOUNDATION_UTIL_H_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define BASE_MAC_FOUNDATION_UTIL_H_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned int NSSearchPathDomainMask;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(OS_IOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(OS_IOS) || defined(MAC_OS_X_VERSION_10_15)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct CF_BRIDGED_TYPE(id) __SecKey* SecKeyRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct CF_BRIDGED_TYPE(id) __SecPolicy* SecPolicyRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/chromium/components/crash/core/common/objc_zombie.mm b/chromium/components/crash/core/common/objc_zombie.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9af0cee..eced952 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/components/crash/core/common/objc_zombie.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/components/crash/core/common/objc_zombie.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +51,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const size_t kBacktraceDepth = 20;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // The original implementation for |-[NSObject dealloc]|.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IMP g_originalDeallocIMP = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OBJC_OLD_DISPATCH_PROTOTYPES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+using RealIMP = IMP;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// With !OBJC_OLD_DISPATCH_PROTOTYPES the runtime hasn't changed and IMP is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// still what it always was, but the SDK is hiding the details now outside the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// objc runtime. It is safe to define |RealIMP| to match the older definition of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// |IMP|.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+using RealIMP = id (*)(id, SEL, ...);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+RealIMP g_originalDeallocIMP = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Classes which freed objects become. |g_fatZombieSize| is the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // minimum object size which can be made into a fat zombie (which can
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,8 +251,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Class rootClass = [NSObject class];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_originalDeallocIMP =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- class_getMethodImplementation(rootClass, @selector(dealloc));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_originalDeallocIMP = reinterpret_cast<RealIMP>(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ class_getMethodImplementation(rootClass, @selector(dealloc)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // objc_getClass() so CrZombie doesn't need +class.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_zombieClass = objc_getClass("CrZombie");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_fatZombieClass = objc_getClass("CrFatZombie");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -335,9 +345,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!m)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const IMP prevDeallocIMP = method_setImplementation(m, (IMP)ZombieDealloc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const RealIMP prevDeallocIMP = reinterpret_cast<RealIMP>(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ method_setImplementation(m, reinterpret_cast<IMP>(ZombieDealloc)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DCHECK(prevDeallocIMP == g_originalDeallocIMP ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- prevDeallocIMP == (IMP)ZombieDealloc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ prevDeallocIMP == reinterpret_cast<RealIMP>(ZombieDealloc));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Grab the current set of zombies. This is thread-safe because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // only the main thread can change these.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -409,7 +420,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Put back the original implementation of -[NSObject dealloc].
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Method m = class_getInstanceMethod([NSObject class], @selector(dealloc));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DCHECK(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- method_setImplementation(m, g_originalDeallocIMP);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ method_setImplementation(m, reinterpret_cast<IMP>(g_originalDeallocIMP));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Can safely grab this because it only happens on the main thread.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const size_t oldCount = g_zombieCount;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 3449634e50a8bc18b35aa28d06b17540cbb00ffe Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Michael Brüning <michael.bruning@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 26 Sep 2019 12:57:40 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix use of deprecated method for scanning wifi networks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-scanForNetworksWithParameters has ben removed in the sdk that ships
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with XCode 11. Replace its use with scanForNetworksWithName.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The results should be the same.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Task-number: QTBUG-78997
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ifaeb6b380d02364133280b44644ae8ca1e51119a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(cherry picked from commit 1f1bd0af331476d46fe69ceb6df14b82f98cd54d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Dmitriy Kuminov <coding@dmik.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
</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;'>-diff --git a/chromium/services/device/geolocation/wifi_data_provider_mac.mm b/chromium/services/device/geolocation/wifi_data_provider_mac.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 278a538..1b53ce4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/services/device/geolocation/wifi_data_provider_mac.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/services/device/geolocation/wifi_data_provider_mac.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,10 +16,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "services/device/geolocation/wifi_data_provider_common.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "services/device/geolocation/wifi_data_provider_manager.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern "C" NSString* const kCWScanKeyMerge;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface CWInterface (Private)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- (NSArray*)scanForNetworksWithParameters:(NSDictionary*)params
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (NSSet<CWNetwork *> *)scanForNetworksWithName:(NSString *)networkName
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error:(NSError**)error;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,9 +38,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base::mac::ScopedNSAutoreleasePool auto_pool;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // Initialize the scan parameters with scan key merging disabled, so we get
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // every AP listed in the scan without any SSID de-duping logic.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSDictionary* params = @{ kCWScanKeyMerge : @NO };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSSet* supported_interfaces = [CWInterface interfaceNames];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSUInteger interface_error_count = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,8 +53,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const base::TimeTicks start_time = base::TimeTicks::Now();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSError* err = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSArray* scan =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [corewlan_interface scanForNetworksWithParameters:params error:&err];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSSet<CWNetwork *>* scan =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [corewlan_interface scanForNetworksWithName:nil error:&err];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int error_code = [err code];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int count = [scan count];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // We could get an error code but count != 0 if the scan was interrupted,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8c785066d987b663ed7d3386151ec8144c31cdcc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Peter Varga <pvarga@inf.u-szeged.hu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 04 Oct 2019 16:06:34 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Workaround presumably wrong macOS SDK detection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Task-number: QTBUG-78997
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: If2915cadda10bc29e9a5596dda0b39fa57623167
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Dmitriy Kuminov <coding@dmik.org>
</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;'>-diff --git a/chromium/base/mac/foundation_util.h b/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8626046..430ab8d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned int NSSearchPathDomainMask;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(OS_IOS) || defined(MAC_OS_X_VERSION_10_15)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// The CSSM_DEPRECATED check is a workaround for a presumably wrong MacOSX SDK detection.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// This macro was added to the Security.framework in the 10.15 SDK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.15/Security.html at SecBase.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(OS_IOS) || (defined(MAC_OS_X_VERSION_10_15) && defined(CSSM_DEPRECATED))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct CF_BRIDGED_TYPE(id) __SecKey* SecKeyRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct CF_BRIDGED_TYPE(id) __SecPolicy* SecPolicyRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/gn/base/mac/foundation_util.h.orig 2019-08-21 07:12:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/gn/base/mac/foundation_util.h 2019-10-24 13:19:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,10 +52,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned int NSSearchPathDomainMask;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef struct OpaqueSecTrustRef* SecACLRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef struct OpaqueSecTrustedApplicationRef* SecTrustedApplicationRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(OS_IOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// The CSSM_DEPRECATED check is a workaround for a presumably wrong MacOSX SDK detection.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// This macro was added to the Security.framework in the 10.15 SDK:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.15/Security.html at SecBase.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(OS_IOS) || (defined(MAC_OS_X_VERSION_10_15) && defined(CSSM_DEPRECATED))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct CF_BRIDGED_TYPE(id) __SecKey* SecKeyRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct CF_BRIDGED_TYPE(id) __SecPolicy* SecPolicyRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_forward_declarations.diff b/aqua/qt5/files/patch-qtwebengine_forward_declarations.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e973c1..7c99c71 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_forward_declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_forward_declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,12 +11,12 @@
</span>
// VNRequest forward declarations.
@class VNRequest;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -328,7 +328,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(readonly, nonatomic, strong) VNFaceLandmarks2D* landmarks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -343,7 +343,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property(readonly, nonatomic, copy) NSString* payloadStringValue;
</span> @end
-#endif // MAC_OS_X_VERSION_10_13
+//#endif // MAC_OS_X_VERSION_10_13
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // ----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // The symbol for kCWSSIDDidChangeNotification is available in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // CoreWLAN.framework for OSX versions 10.6 through 10.10. The symbol is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Once Chrome no longer supports macOS 10.13, everything within this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // preprocessor block can be removed.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_tests.diff b/aqua/qt5/files/patch-qtwebengine_tests.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f3d3cf..85f8827 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@
</span> CONFIG -= qt
--- src/core/configure.json.orig 2018-11-26 21:10:38.000000000 -0700
+++ src/core/configure.json 2018-12-09 10:07:41.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,82 +339,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -344,82 +344,82 @@
</span> "features": {
"webengine-system-fontconfig": {
"label": "fontconfig",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +106,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-python2": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -458,7 +458,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -463,7 +463,7 @@
</span> },
"webengine-alsa": {
"label": "Use ALSA",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +115,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-v8-snapshot": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -474,17 +474,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,17 +479,17 @@
</span> },
"webengine-system-khr" : {
"label": "khr",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +136,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-winversion" : {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -494,13 +494,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -499,13 +499,13 @@
</span> },
"webengine-geolocation": {
"label": "Geolocation",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +152,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-pepper-plugins": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -577,31 +577,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -581,31 +581,31 @@
</span> "webengine-system-libwebp": {
"label": "libwebp, libwebpmux and libwebpdemux",
"autoDetect": "config.unix",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,7 +189,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-system-ninja": {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -617,12 +617,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -621,12 +621,12 @@
</span> },
"webengine-system-glibc": {
"label": "glibc",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +204,7 @@
</span> && libs.webengine-libxml2
&& tests.webengine-libxml2-compatible",
"output": [ "privateFeature" ]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -630,17 +630,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -634,17 +634,17 @@
</span> "webengine-system-lcms2" : {
"label": "lcms2",
"autoDetect": "features.webengine-printing-and-pdf",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -225,7 +225,7 @@
</span> "output": [ "privateFeature" ]
},
"webengine-ozone-x11" : {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -663,7 +663,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -667,7 +667,7 @@
</span> "webengine-poppler-cpp": {
"label": "poppler-cpp",
"autoDetect": "config.unix",
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-tst_benchlibcallgrind.diff b/aqua/qt5/files/patch-tst_benchlibcallgrind.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e23a639..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-tst_benchlibcallgrind.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp.orig 2014-06-28 00:25:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp 2014-06-19 03:08:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,9 +68,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QBENCHMARK {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm__ __volatile__(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "mov $100000000,%%eax \n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "LOOPTOP: \n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "1: \n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "dec %%eax \n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "jnz LOOPTOP \n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "jnz 1b \n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : /* no output */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : /* no input */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : /* clobber */ "eax"
</span></pre><pre style='margin:0'>
</pre>