<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/19509f92f51e6a5e62f209a331e7a15fddefba7a">https://github.com/macports/macports-ports/commit/19509f92f51e6a5e62f209a331e7a15fddefba7a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 19509f9  qt5: update version 5.13.2->5.14.0
</span>19509f9 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 19509f92f51e6a5e62f209a331e7a15fddefba7a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Jan 3 08:02:40 2020 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qt5: update version 5.13.2->5.14.0
</span>---
 _resources/port1.0/group/qt5-1.0.tcl               |  18 +-
 aqua/qt5/Portfile                                  | 273 +++++++++++---------
 aqua/qt5/files/patch-find_rez.diff                 |   2 +-
 aqua/qt5/files/patch-mkspecs.diff                  |  10 +-
 aqua/qt5/files/patch-pc_files.diff                 |   4 +-
 .../patch-qtmultimedia_no_macports_openal.diff     |   2 +-
 .../patch-qtwebengine_forward_declarations.diff    |  22 --
 aqua/qt5/files/patch-qtwebengine_tests.diff        | 285 +++++----------------
 8 files changed, 242 insertions(+), 374 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 1a77e4b..e5a0239 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.13}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    qt5   {qt5-qtbase   5.14}
</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;'>@@ -120,6 +120,7 @@ proc qt5.get_default_name {} {
</span>         #
         # macOS Sierra (10.12)
         #
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Qt 5.14: Not Supported but seems to work
</span>         # Qt 5.13: Supported
         # Qt 5.12: Supported
         # Qt 5.11: Supported
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,6 +135,7 @@ proc qt5.get_default_name {} {
</span>         #
         # macOS High Sierra (10.13)
         #
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Qt 5.14: Supported
</span>         # Qt 5.13: Supported
         # Qt 5.12: Supported
         # Qt 5.11: Supported
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,6 +147,7 @@ proc qt5.get_default_name {} {
</span>         #
         # macOS Mojave (10.14)
         #
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Qt 5.14: Supported
</span>         # Qt 5.13: Supported
         # Qt 5.12: Supported
         #
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,6 +157,7 @@ proc qt5.get_default_name {} {
</span>         #
         # macOS Catalina (10.15)
         #
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Qt 5.14: Supported
</span>         # Qt 5.13: Not Supported but seems to work
         # Qt 5.12: Not Supported but seems to work
         #
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,6 +445,12 @@ namespace eval qt5pg {
</span>             lib/pkgconfig/Qt5Declarative.pc
             ""
         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        qtquick3d {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/pkgconfig/Qt5Quick3D.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>         qtquickcontrols {
             5.1
             6.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -453,6 +463,12 @@ namespace eval qt5pg {
</span>             lib/pkgconfig/Qt5QuickControls2.pc
             ""
         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        qtquicktimeline {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            libexec/qt5/qml/QtQuick/Timeline/libqtquicktimelineplugin.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>         qtremoteobjects {
             5.9
             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 fd36fab..ef73b05 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.13.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             5.14.0
</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.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.14
</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.13/qtmodules.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module info found at https://doc.qt.io/qt-5.14/qtmodules.html
</span> #
 ###############################################################################
 array set modules {
     qt3d {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            44ace68d9969a6aa2f7996383fc6950f56fe462d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            d1b9fc0be82264b5f76c3a5330901dff95c1f2bcb67916c3fac6bad4ff69adc9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            81537856
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            b9b82b544bebbce04d66f0f1b5b4a0745f6ef8a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            515b57d0f99be48f70817cf73bc8a0c0e63f7c9c41dbf35fc8baf065fc752515
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            81564944
</span>         }
         ""
         "port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,17 +141,17 @@ array set modules {
</span>         {"Qt 3D"}
         ""
         "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: "
     }
     qtbase {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            94749bf68e78cf3e3fa84a8df73910b501869293
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            48735704
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            93c389e91acc45e0e580d6c3fc43df911e84dc6f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            49713412
</span>         }
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "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><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "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 port:zstd"
</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"}
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,9 +161,9 @@ array set modules {
</span>     }
     qtcharts {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            37bc5548361ff55cefcc472e9eddd25826119992
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            3bad81c3cfb32cf72fb0ce2ac2794d031cf78a3902b4715f89c09b2d0e041e87
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            4244092
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            a6e5685a16eefc54780f8aec3613bc2bb2c4865e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ce7e22ca84e6a5fb85d6eb9e196407e0fa02848187548a2c388668e71f41a346
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4250368
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,9 +176,9 @@ array set modules {
</span>     }
     qtconnectivity {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            5001272b8ba4bf8ca0699a71a160bf99808dcc51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            644e234eb64f602ef5cdeb8802ef9b58e75478f1124f001937275d62ed692e17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            2777504
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            529c71fd26c500fa1876c62b19cbe8a5240e458c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2843b3b479d0feba0624eb4ae41382b99db77b87a6b7dea5aacdf3b33644f0bd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2791788
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,9 +191,9 @@ array set modules {
</span>     }
     qtdatavis3d {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            f9b6d842aed45aa64a51edd39721e7a76332f52c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ecf934c3eb07173505781734f95cfc2cf9d89e6b1b98516ac98a137797f4ef28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5182216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1d38ec8a991c696f2d222aab0a861ffa15ca10bd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ba7269413b04de74086e2b876f3e4d39e90f14f363011ff36d082485dc683eb1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5190556
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,9 +206,9 @@ array set modules {
</span>     }
     qtdeclarative {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            0ffe0f6c54cfb6ae8d05b9d1023a2b29bcf62c25
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            d9a524f45fe9e136cda2252f9d7013ec17046d907e3f39606db920987c22d1fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            20940748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            914655dc852e01a4711a85946b76bdc634c5dff2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            21250100
</span>         }
         "port:python27"
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,9 +221,9 @@ array set modules {
</span>     }
     qtdoc {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            c15972fa405ae8f8cd2dfb77b442168a863de15a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            be09543143d5dca984d2c2d9085751317e7a95b78fdbe9b6a30f2faa03543e46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5747084
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6df50410461617a92897886d26f5ffd9d2f19e6b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            111384c0d98cbd4cd131001b941e06788f99f29661bdd18b70dff81768aebc24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5735412
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,9 +236,9 @@ array set modules {
</span>     }
     qtgamepad {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            7323d110e3090bc189c0b5a05d5737514dc2f4c2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            75164885433e36a90b557aa7f319ff3d6278c3616469f67b42dda6eb8b92e76e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            386668
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            65a9d9bb69106b62454a365eb1bd35bdf53f37a2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            3d9835538afe7299e42d53a7bb85fb90aecdc714846671582139ff80d752a657
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            386864
</span>         }
         ""
         "port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,9 +251,9 @@ array set modules {
</span>     }
     qtgraphicaleffects {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            5740edaf153498882157449602c74171937a58ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            297a89bb6c771f849c4ce866e5c98dadf665163b3dab03bc48a58f51424e7e66
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            14845928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ee5b372e288038be965f466a74c713db960f9669
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            d931637d97cbb0e57bf2d78bf0eb06494f21a05d2e6a17e7c4f4f2a2fabc23cd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            14041132
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,9 +266,9 @@ array set modules {
</span>     }
     qtimageformats {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            b9118a89a786418f8227981674a3d1ce80b62713
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            6968649fdccc7d633cf9ada25f1bdaf0a2fb45a214d58c2c47896166d4553ac0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1803796
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            d19f6f53005d6ffeb48e1f2cd93b26cf1ed4a6f6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            959f169af5fc09ef248062a457b78a667acafee71e57ea14fb14ff6f5dd898d5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1809880
</span>         }
         ""
         "port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,9 +281,9 @@ array set modules {
</span>     }
     qtlocation {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            69484f3b23039dfc94a52ef9adac79ade1e1afbb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5fe4b824d3dc6c800682ff986333ec09edb9c27582066e928b1862b4d58212e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            6050044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            f225c0ff4fe52897852d6eadc6910448c521f183
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            87906fd100dd93ed495a4db2c435dcfab073d399ea11d5e18727cc782fac4cd1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6116428
</span>         }
         ""
         "port:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,9 +296,9 @@ array set modules {
</span>     }
     qtlottie  {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            be5e31c30b35d25841c8da4ac3f69884d7779ec5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            af9a10aaa110767ffd88e02cb8ad0a3930ccfeb61f0c125afbf3791136d36253
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            82052
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            605d14c33588d554ad042e9b3ba3860441827f94
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            583066d0567739b7a53b2b096bfd44e8e29dfb10a38e15796f61782f6b413291
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            82568
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,9 +311,9 @@ array set modules {
</span>     }
     qtmacextras {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            b816c248bca3a3576dde2a79f1f124e9e9059694
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            545ede0783ebc2405c6efa6ed0b2b7147a1d7e60eb7fcb853abfca0a9cb65ed5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            69164
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            d99b9059993b643f19ceaa8541332da70f74a640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            605218e639bfde7563ba114c20da2a8254b1352994cf95ff6300b8fa2e4769bd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            69316
</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;'>-            6b6f99e01c307b260bb1c8d906a27e67e1c81e7b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5f885459d46ea2f2bb24597678befd4913d8f88029730d01984f51f9c367b9f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            3820660
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            e14b91a41bf0a4873dbaecc61f765e33b76bde54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            e7901aa32fe71f1409cf73a0c62f27b98f434688e7b16ea8591b29cd8f90ad5e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            3758400
</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;'>-            95b35ac7e7d619c71056e5961bbb71de414026c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            6326943e5c1a3e6eac8dcc44d088f1a3d1c45d14100ff1e95f833b0463243af3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            141172
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            fe88699cfea83d0b920df3e2c26ac503a5c2fe44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            16e8e9ed817a9cf1373f8ec57e4a6da9983fc8c5c80d0c61e092414d25472d11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            141372
</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;'>-            e4fcdeecfaa2ea185557dd76cd83b7329c74dadc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            e9ef800b7d79f660c72f7024f82a2915b1111b47417f93c3dc2354b9bf307ff4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            208096
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            82ae1924ef20a6110a8fa76aff73e671c873937e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            c7754bde43762c3037e14f684885d58a699b2ec18a016dd3f0c4c96178790624
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            208684
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,11 +369,26 @@ array set modules {
</span>         "revision 0"
         "License: {GPL-3 OpenSSLException}"
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    qtquick3d {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            fcbb78d48df7d28272a16c29b9ab9835d14c8177
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            a826eb4c66b442daf298fceb2099dd2ab3d736c566e50f8a9213aaa80e86177c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            61174316
</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;'>+        "port:assimp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {"Provides a high-level API for creating 3D content or UIs based on Qt Quick."}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "technology preview module; GPLv3 license only"
</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>     qtquickcontrols {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            5c4fa9e83cede4e873c23172502a36d22936062e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            d6e64d8db13ada55fcb0d5e8ca26097085680087d931435c6c6db859d87493ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5955448
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5f165978c556d70f3d86a347322ac84f6d17e9ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6dd477bcb36a94ab417faab5e607f7a07c217c4ca3f751d8d76d475ab0f3558e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5982792
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -386,9 +401,9 @@ array set modules {
</span>     }
     qtquickcontrols2 {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            75863e6ec38e4e5319efc3a8c4fccfcceeabddf6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            90ee8be7b66cc65f3f22e71a0b35adab5c169ac4f8ebc6f9e7685228bf8a7d70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            9252912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            dc0c130b33442aa4b0bd1e61aed562fe72088834
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            827bf86db44ce4f698f172378313db04e1cb81c593e9342bdd95bb1708f27911
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            8137536
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,11 +414,26 @@ array set modules {
</span>         "revision 0"
         "License: "
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    qtquicktimeline {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            533dce4a3a4215e0884ad3fb2ba9e8592a473fc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7582d742a1a2cd86d5da8cc30d24ca6bd26753ac81ea65e88369dafe36f5e8f4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            102584
</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 platform target to compile Qt applications for the web browsers using WebAssembly."}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "technology preview module; GPLv3 license only"
</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>     qtremoteobjects {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            20097626c8ea2d6cf8de9b318e45bd716f597869
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            bd24db9d2bb08ae7955291af52ee7510aa193d0f72ed0e3ff74f7cf7e81f4d65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            367032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            c5cb434d621e6a47f2bb2b3247256b61280c4dcb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            306765539d97c9c5b9e262393b1950d14f487260f2e333019010689de04bd235
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            370976
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -416,9 +446,9 @@ array set modules {
</span>     }
     qtscript {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            71e26d3b2ce11bfa51d0748ff2e73983e33c26f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            3d92691c25577fbf7511d40253de0cd9d31444ea5a0aa860f65efb9fa0f3ce70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            2696452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            c2b4c51f367a24a91f4d65d02b17e68de6e6bf38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6715ed5294013edfc338367b63ee6df2438965e4626435f30837e26a2151d3b9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2645580
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -431,9 +461,9 @@ array set modules {
</span>     }
     qtscxml {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            a77625982d484e0ca8a43f986522788f769318f0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            e489dff21e18c1e7f72ffd31af82404f845bd90824c6b978140591366398a9d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            435428
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            25ddf3214dba91afd3d7da8d4200c09af8f7a2e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7ed1497dc35f9b5d16a1ad529c3c181973ecae71b31db04aaeb5743f15b4feab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            433264
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -446,9 +476,9 @@ array set modules {
</span>     }
     qtsensors {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            8e722c909dfdf14df32fbe93e4ec8d227cf13297
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            46f73bbfddfd78a419c6424d6839318774b84c955a7f7a96c12c590f6d8fb177
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            2046708
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            fddb5645e8ed92ebea39af98eefa563dc65e1bef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            306fc19309b218b062eb6415e2a8364c5c3b53c2942e200012d45f0c33717926
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2042940
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,13 +491,13 @@ array set modules {
</span>     }
     qtserialbus {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            2ff0ed6d010569251cfa0937c74bf7bbf28c1bc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            48159393b1368976b5324eac48424e2a6e5d63c783194d0576a978151f882da3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            338428
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            91efe0f99a9eaf7f40fc86e1ce549ce8921ab55e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4c6a79a7c993200cd5043a321b9b0597a4e678f58e6b5b32931cce59bcab7694
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            344580
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtserialport"
</span>         {"Qt Serial Bus"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,9 +506,9 @@ array set modules {
</span>     }
     qtserialport {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            7238c5988a02b6ea2c9d2e01e37614fe362c7e38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            7677ffc1dce3b75c0a98d07d215588a8dccb5c276c55b4ecd60c35ed1c89cb34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            310736
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            39f5aa54ebe922a4018df936b67728ae993019ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4b647a66ae4da6b05b41b49ed296012002c1951f8a3ee24e0f2aa493f48e1ed3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            311168
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,9 +521,9 @@ array set modules {
</span>     }
     qtspeech {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            8f41ce8fec774203e5bbf9ef59748d3ae3d42239
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            a0aca08feeac6925ead7f841319bdcfd60bfc126de07807edaf267c2ca8d13d5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            100312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            b1b79e5170d415dc8687dd32a1fac8ab12f51505
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            c62ba6080a779f8a62e727a33c277cf0744426804f6774e1000bdee0799e7725
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            101092
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,9 +536,9 @@ array set modules {
</span>     }
     qtsvg {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            8bc01bd283fe156a09e594ee432c30ee74ce8ab6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            849e2e357e1333b64ecb728352f652cd8d916f029ed848f775b15d0b500cb7d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1890380
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ebebfbce0f6c786866c788d7d6a91274e393c528
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1ee51a66e1996f96bf7fd4c696079c4cb22ea2bc710d47535c1daf3638d8f393
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1865488
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,9 +551,9 @@ array set modules {
</span>     }
     qttools {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            a5b422b534c00437a9adb1cfe4ccb7afd2e8854a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            9110256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ba66d5130b780b8b7b58ec528471fd55baf3adf1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            8d7f8612ab6078fe7289d8a8dd8112b550fd0f51b5455df2dcfba651c30c3adf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            9143808
</span>         }
         ""
         "port:clang-9.0"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -536,9 +566,9 @@ array set modules {
</span>     }
     qttranslations {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            4bd7a4da9034603ec6de5f72aca2e3188720f876
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1365880
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            0c084b7de69ba3a952e7d32876c60562e0f1a8d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            8b7529e102233153bfecc608d3944e11e086421c72e2d4eaf7e95ebbef301609
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1332516
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -551,9 +581,9 @@ array set modules {
</span>     }
     qtvirtualkeyboard {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            abd0f990c262ac13e7f0e0ad9cc372f9878437d8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            8e368dde237d21666f6cc8512a060e205388e519a4d7559c0505cc75224ed62b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            10923292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1641271fb5aeb0b7f169ba0cf148bf572d4cac4d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2f3362bf7999b912a4e92d0e9b5378089bc8dfcf270fe226bc68f2050de31410
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            10961900
</span>         }
         ""
         "port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,9 +596,9 @@ array set modules {
</span>     }
     qtwebchannel {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            624790b4ce487ff62e5ca4db2bdf94aa4f7638bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            f452d419d8b19b566835f316bbf282dabc8b1c2a74c9c98c1aec4184465e9c13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            192652
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4086adcefade0caf4a4493ba23275c0a9c9e5b5a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            0cb8dd07b34da8d44f8a14701409ce87fce5010f9b57273b357717c2dfd35383
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            196400
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,9 +611,9 @@ array set modules {
</span>     }
     qtwebengine {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            db36dd8fade1ea196e273304855292df46e3f24e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            255593964
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            c3e4701febb473d40901258197c2c1d72d2ac36a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            74f8c11cc318612c8d9dc87cf791badb1efe7080c10d8b3ed5843b249a942d32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            241565016
</span>         }
         "port:python27 port:py27-ply path:bin/ninja: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 +621,14 @@ array set modules {
</span>         {"Qt WebEngine"}
         "very large and relatively new"
         "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: "
     }
     qtwebglplugin {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            95daeefa4fe3b98994dcc0218efb6180e472e7ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ae369929d5a3356391bccd25cac22846dc44cbb726ce7b60924f53944addabb7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            73608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            f6046759f9dba58a8d7406d74a44f996803d61c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            9707f7b860d798d478c0237c49ab43d4b99e1ad5b297555a4df6ffac4c5a1a76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            74000
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,9 +671,9 @@ array set modules {
</span>     }
     qtwebsockets {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            985bd55daed9c4f99af165986379a40532e477fc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            fc11236c8bf69b27a4e237a27b9ea27fc90d8c25d81d1d451ce3a0b63cbc02d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            244668
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            25d4184f68b12a6e7d7cb75081e23927ea1f13a0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            50b881e83225b21e6657361e1af9b0154117d5efc03ba8c87aecacee3e42b0ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            246892
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -656,9 +686,9 @@ array set modules {
</span>     }
     qtwebview {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            44df0e0dc744c1018529a5c9b4ac88689e81949c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            394cc7a9cb29b7883816ff3137b022f30568151aada0739fc99a23789c21c015
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            131168
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            05f64e0e982bca80c405fcec2aa1569b0bade242
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            a1ded2eae5d66d8ddde3e56077c0e895aff74ae029cebaf901f91f87c5a89dc3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            132784
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -671,9 +701,9 @@ array set modules {
</span>     }
     qtxmlpatterns {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            d0be90cf4c12d789731b5a1cbdb86992c0b811ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1e87d8c004ec0beea3b29d13f0964c563aa9fae51c392c998750ca4e386374e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1392192
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            04cbea82bda3b20279d0182db840a1681dbeb2fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            935209e91942e89d569f977153f0ca209125c205065960e55d4f4065a96d90d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1393732
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1113,7 +1143,6 @@ foreach {module module_info} [array get modules] {
</span>                 -no-openssl         \
                 -no-libproxy        \
                 -system-pcre        \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                --disable-xcb       \
</span>                 -glib               \
                 -no-gtk
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1151,7 +1180,6 @@ foreach {module module_info} [array get modules] {
</span>                 -no-directfb            \
                 -no-linuxfb             \
                 -no-kms                 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                -no-mirclient           \
</span>                 -no-libinput            \
                 -no-system-proxies
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1374,6 +1402,13 @@ foreach {module module_info} [array get modules] {
</span>             }
 
             # special case
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { ${module} eq "qtquick3d" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # see config_help.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                configure.post_args-append   -- \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                             -system-assimp
</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;'>+            # special case
</span>             if { ${module} eq "qtwebkit" } {
 
                 # use MacPorts icu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1444,6 +1479,7 @@ foreach {module module_info} [array get modules] {
</span>                     set qt_list        [lreplace ${qt_list}        0 0]
                     set framework_list [lreplace ${framework_list} 0 0]
                 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>                 set libreplace [string repeat ../ [llength ${qt_list}]][join ${framework_list} /]
                 if { ${libreplace} ne "lib" } {
                     patchfiles-append patch-shared.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1480,21 +1516,24 @@ foreach {module module_info} [array get modules] {
</span>                 #     Undefined symbols for architecture x86_64
                 conflicts_build-append ${subport}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                # either have VNRequest forward declarations or include correct header file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                patchfiles-append     patch-qtwebengine_forward_declarations.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>                 # do not opportunistically find MacPorts libraries (e.g. X11 libraries)
                 patchfiles-append patch-qtwebengine_tests.diff
 
                 # see https://trac.macports.org/ticket/59294
                 use_xcode yes
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                # see config_help.txt
</span>                 configure.post_args-append         \
                     --                             \
                     -webengine-native-spellchecker \
                     -webengine-kerberos \
                     -system-webengine-icu \
                     -system-webengine-ffmpeg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # missing file spell_check_host_chrome_impl_mac.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # TODO: investigate further
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                configure.post_args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -webengine-native-spellchecker
</span>             }
 
             # special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-find_rez.diff b/aqua/qt5/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ddbe03..c0b7e14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@
</span> -QMAKE_RESOURCE          = /Developer/Tools/Rez
 +QMAKE_RESOURCE          = __MACPORTS_Rez__
  QMAKE_EXTENSION_SHLIB   = dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_EXTENSIONS_AUX_SHLIB = tbd
</span>  QMAKE_LIBDIR            =
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span> --- mkspecs/features/mac/rez.prf.orig     2015-10-12 21:35:32.000000000 -0700
 +++ mkspecs/features/mac/rez.prf       2017-11-04 22:44:49.000000000 -0700
 @@ -1,7 +1,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-mkspecs.diff b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d55398..8ee256a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-mkspecs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,13 +20,13 @@
</span> -QMAKE_MAC_SDK           = macosx
 +QMAKE_MAC_SDK           = __MACPORTS_MAC_SDK__
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
</span> -QMAKE_APPLE_DEVICE_ARCHS = x86_64
 +QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 +QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
<span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_MAC_SDK_VERSION_MIN = 10.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_MAC_SDK_VERSION_MAX = 10.15
</span>  
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Should be 10.15, but as long as the CI builds with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # older SDKs we have to keep this.
</span> --- mkspecs/macx-clang/qmake.conf.orig    2017-06-28 02:54:29.000000000 -0700
 +++ mkspecs/macx-clang/qmake.conf      2017-08-27 07:13:38.000000000 -0700
 @@ -21,8 +21,8 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +42,9 @@
</span>  include(../common/gcc-base-mac.conf)
 --- mkspecs/common/clang-mac.conf.orig 2017-06-28 02:54:29.000000000 -0700
 +++ mkspecs/common/clang-mac.conf      2017-08-27 07:17:44.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,8 +6,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,8 +7,8 @@ 
</span>  QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO = -Wl,-object_path_lto,${OBJECTS_DIR}/${TARGET}_lto.o
</span>  
 -QMAKE_CXXFLAGS += -stdlib=libc++
 -QMAKE_LFLAGS   += -stdlib=libc++
<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 37a3564..f067eeb 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,11 +1,11 @@
</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;'>-@@ -3426,7 +3426,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3393,7 +3393,7 @@
</span>          t << "-I${includedir}";
      if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
          && libDir != QLatin1String("/Library/Frameworks")) {
 -            t << " -F${libdir}";
 +            t << " -F${libdir} -I${prefix}/include";
      }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     t << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     t << Qt::endl;
</span>  
<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 e336d52..b96e921 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;'>-@@ -125,7 +125,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,7 +138,7 @@
</span>              "label": "OpenAL",
              "test": "openal",
              "sources": [
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7c99c71..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/base/mac/sdk_forward_declarations.h.orig 2018-11-13 11:25:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/base/mac/sdk_forward_declarations.h      2018-12-09 08:42:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,8 +262,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Once Chrome no longer supports OSX 10.12, everything within this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // preprocessor block can be removed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(MAC_OS_X_VERSION_10_13) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//#if !defined(MAC_OS_X_VERSION_10_13) ||                 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // VNRequest forward declarations.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @class VNRequest;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -343,7 +343,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(readonly, nonatomic, copy) NSString* payloadStringValue;
</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;'>--#endif  // MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//#endif  // MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Once Chrome no longer supports macOS 10.13, everything within this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 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 85f8827..6497219 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;'>@@ -1,236 +1,71 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.tests/snappy/snappy.pro.orig    2018-11-26 21:10:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.tests/snappy/snappy.pro 2018-12-08 12:40:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--linux:SOURCES += snappy.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SOURCES += snappy.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS += -lsnappy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG -= qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/configure.json.orig   2018-11-26 21:10:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/configure.json        2018-12-09 10:07:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -344,82 +344,82 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     "features": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-fontconfig": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "fontconfig",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-fontconfig",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && libs.webengine-fontconfig",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-dbus": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "dbus",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-dbus",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && libs.webengine-dbus",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-libdrm": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "libdrm",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-libdrm",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "!config.macos && libs.webengine-libdrm",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-xcomposite": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/buildtools/configure.json.orig     2019-12-03 00:18:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/buildtools/configure.json  2020-01-02 09:29:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,25 +33,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-xcomposite": {
</span>              "label": "xcomposite",
<span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-xcomposite",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "!config.macos && libs.webengine-xcomposite",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                { "type": "pkgConfig", "args": "xcomposite" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                { "type": "pkgConfig", "args": "xcomposite-fail-on-macports" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ]
</span>          },
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-xcursor": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-xcursor": {
</span>              "label": "xcursor",
<span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-xcursor",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "!config.macos && libs.webengine-xcursor",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                { "type": "pkgConfig", "args": "xcursor" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                { "type": "pkgConfig", "args": "xcursor-fail-on-macports" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ]
</span>          },
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-xi": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-xi": {
</span>              "label": "xi",
<span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-xi",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "!config.macos && libs.webengine-xi",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                { "type": "pkgConfig", "args": "xi" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                { "type": "pkgConfig", "args": "xi-fail-on-macports" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ]
</span>          },
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-xtst": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-xtst": {
</span>              "label": "xtst",
<span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-xtst",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "!config.macos && libs.webengine-xtst",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-harfbuzz": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "harfbuzz",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-glib" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "glib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && libs.webengine-glib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && libs.webengine-glib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-minizip" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "minizip",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && libs.webengine-minizip",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && libs.webengine-minizip",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-zlib" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "zlib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && features.system-zlib && libs.webengine-zlib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && features.system-zlib && libs.webengine-zlib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-libevent" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "libevent",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && libs.webengine-libevent",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && libs.webengine-libevent",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-jsoncpp" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "jsoncpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && libs.webengine-jsoncpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && libs.webengine-jsoncpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-protobuf" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "protobuf",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && libs.webengine-protobuf && tests.webengine-protoc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && libs.webengine-protobuf && tests.webengine-protoc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-png" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "png",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && features.system-png && libs.webengine-png",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && features.system-png && libs.webengine-png",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-jpeg" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "JPEG",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && features.system-jpeg && libs.webengine-jpeglib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && features.system-jpeg && libs.webengine-jpeglib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-python2": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -463,7 +463,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-alsa": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "Use ALSA",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && tests.webengine-alsa",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "!config.macos && config.unix && tests.webengine-alsa",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-v8-snapshot": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -479,17 +479,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-khr" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "khr",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && tests.webengine-khr",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "!config.macos && config.unix && tests.webengine-khr",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-libvpx" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "libvpx",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && tests.webengine-libvpx",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "!config.macos && config.unix && tests.webengine-libvpx",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-snappy" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "snappy",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && tests.webengine-snappy",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && tests.webengine-snappy",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-winversion" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -499,13 +499,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-geolocation": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "Geolocation",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "module.positioning",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && module.positioning",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "publicFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-pulseaudio": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "Use PulseAudio",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.pulseaudio",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && libs.pulseaudio",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-pepper-plugins": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -581,31 +581,31 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-libwebp": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "libwebp, libwebpmux and libwebpdemux",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-webp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && libs.webengine-webp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-opus": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "opus",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-opus",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && libs.webengine-opus",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-ffmpeg": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "ffmpeg",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "autoDetect": false,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-icu": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "icu",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "autoDetect": false,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-icu",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && libs.webengine-icu",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-re2": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "re2",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "tests.webengine-re2",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && tests.webengine-re2",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-ninja": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -621,12 +621,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-glibc": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "glibc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.linux && tests.webengine-glibc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.linux && tests.webengine-glibc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-libxml2": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "libxml2 and libxslt",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                          && libs.webengine-libxml2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                          && tests.webengine-libxml2-compatible",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -634,17 +634,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-lcms2" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "lcms2",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "autoDetect": "features.webengine-printing-and-pdf",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && libs.webengine-lcms2",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && libs.webengine-lcms2",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                { "type": "pkgConfig", "args": "xtst" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                { "type": "pkgConfig", "args": "xtst-fail-on-macports" }
</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;'>+         "webengine-nss": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-x11" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label" : "x11",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                { "type": "pkgConfig", "args": "x11" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                { "type": "pkgConfig", "args": "x11-fail-on-macports" }
</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;'>+         "webengine-glib": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,25 +210,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-xcomposite": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "xcomposite",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                { "type": "pkgConfig", "args": "xcomposite" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                { "type": "pkgConfig", "args": "xcomposite-fail-on-macports" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ]
</span>          },
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-freetype" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "freetype",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && features.system-freetype && libs.webengine-freetype",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && config.unix && features.system-freetype && libs.webengine-freetype",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-xcursor": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "xcursor",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                { "type": "pkgConfig", "args": "xcursor" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                { "type": "pkgConfig", "args": "xcursor-fail-on-macports" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ]
</span>          },
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-system-x11" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "x11",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "config.unix && libs.webengine-x11",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "!config.macos && config.unix && libs.webengine-x11",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-xi": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "xi",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                { "type": "pkgConfig", "args": "xi" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                { "type": "pkgConfig", "args": "xi-fail-on-macports" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ]
</span>          },
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-ozone-x11" : {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -667,7 +667,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-poppler-cpp": {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "label": "poppler-cpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "condition": "libs.webengine-poppler-cpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "condition": "config.macos && libs.webengine-poppler-cpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-xtst": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "xtst",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "sources": [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                { "type": "pkgConfig", "args": "xtst" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                { "type": "pkgConfig", "args": "xtst-fail-on-macports" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ]
</span>          },
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         "webengine-win-compiler64": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-ffmpeg": {
</span></pre><pre style='margin:0'>

</pre>