<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/e0babf1f7ad4f6675b3a8ec2c8a105a4af675427">https://github.com/macports/macports-ports/commit/e0babf1f7ad4f6675b3a8ec2c8a105a4af675427</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e0babf1f7ad4f6675b3a8ec2c8a105a4af675427
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Dec 15 08:00:50 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qt5: update version 5.11.3->5.12.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes https://trac.macports.org/ticket/57574
</span>---
 aqua/qt5/Portfile                                  | 292 ++++++++++-----------
 aqua/qt5/files/patch-mkspecs.diff                  |  51 +---
 aqua/qt5/files/patch-pc_files.diff                 |  15 --
 .../patch-qtmultimedia_no_macports_openal.diff     |   2 +-
 aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff  |   8 +-
 .../patch-qtwebengine_forward_declarations.diff    |  22 ++
 aqua/qt5/files/patch-qtwebengine_tests.diff        | 242 +++++++++++++++++
 aqua/qt5/files/patch-qtwebengine_xcode10.diff      |  94 -------
 .../patch-qtwebkit-examples_header_location.diff   |  55 ++++
 9 files changed, 477 insertions(+), 304 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d4aee2c..75a78ed 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.11.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             5.12.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.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.12
</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.11/qtmodules.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module info found at https://doc.qt.io/qt-5.12/qtmodules.html
</span> #
 ###############################################################################
 array set modules {
     qt3d {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            9fe6a7bfa80b9262c50aad4a7abb1edd349cecb8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            04a55c21f365d897ec75042ee83f9ad59a847992c6f55fae0763ad2701d99eab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            84944236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            0069c65bdd3b55ce4a3f44be0ce94cea8cd80da3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            a12adc9c14ffa18ff5c4951efb41914d4840a0c2a88486eb8d39a4833e4631da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            84949704
</span>         }
         ""
         "port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,9 +146,9 @@ array set modules {
</span>     }
     qtbase {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            71c7c5498a02b7d8019b26c6b7ebc1a2321a3284
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            c6bf887732b83ce072eb72eddb7497bedcdf9ca794e7ed91261a93f063623e1c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            46997676
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            83fbdcf4cfa783c7e1be09fee1a439c26d006a70
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            48288896
</span>         }
         ""
         "port:zlib port:libpng port:jpeg port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre2 port:harfbuzz"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,9 +161,9 @@ array set modules {
</span>     }
     qtcanvas3d {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            b4cf945c2aee4b2bb6b503f4f8996fab471fa821
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            d5a004848588c1c53ea7ed9d36bb5bfe3a813ffc45290066d2f6cfcace072138
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            10915004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            8c1414770b3479c2463840505a8bcfc54c852cc2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            b21b9f01c498d0e51e3db4c54344147fb901c0f40ec8b3135609905b55f9c128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            10914876
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,9 +176,9 @@ array set modules {
</span>     }
     qtcharts {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            6404cb97674c6d713d2fbfc1fc64957fafebeb66
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            4798f3ebc4d937d1c190db7ff718ad5affa907caa56b5557e593f6b5a60d95dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            4239348
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            f2ab6d30427152f8e9e630b8de52494b757e7a67
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            9cd71c4a4c10611083ce8f16992c59666d51b5275cc1a79f324ee18579ced450
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4242288
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,9 +191,9 @@ array set modules {
</span>     }
     qtconnectivity {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            fc9b5dbaa5bf66ac71ef26d6bcb746606211d036
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            148cfcbceb3d0a70059f4d92fa069baf56babb627b16a4203b318ca6f0d0b32a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            2729800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            246d95a80f5d1b9fcb076ceaa63c2c9ed8449e4c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            8ebca1ba859ebb5b0e8e6fffff1f8131dd84f9e44448df6ac58c8be32b5122a4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2740124
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,9 +206,9 @@ array set modules {
</span>     }
     qtdatavis3d {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            4eb4b82b61a64500f4a9a4fe3b02a2cd44875df4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            83362eb9b55de61fa686c898fc4300494abdc2ec4f6e2422f19e6db6d5c81ccf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5201492
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            19c06fa3dce52d179f68fefcd498a798b7d1d946
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4eda7e352b5d7d58a19611f76a906e952f6a86451740a80a3759b8871090f433
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5201308
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,13 +221,13 @@ array set modules {
</span>     }
     qtdeclarative {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            21c3191728692a0f129d25cfc0cd14b64bca4156
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            8e263621d706f1c4def5d71212a6ae37b0d3c378da89d9e3e5fc0b5557721ae6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            22233024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            9cb53067daaa9d02e482b62abb6b3a7fbfacc184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4ffd58102b5714ae058f91cc31511f1c928978f77f01652beb9ce2352a4c227b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            20436712
</span>         }
         "port:python27"
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtsvg qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtsvg"
</span>         {"Qt QML" "Qt Quick" "Qt Quick Layouts" "Qt Quick Widgets"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,13 +236,13 @@ array set modules {
</span>     }
     qtdoc {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            59db45690965d44c651d8adacc77309fdfb220b6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            585316a166a798b8379429bcaa5438b019455375c4e3e25df448d2983f45d41a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            3331620
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            844a2f27c363fbdb6e5f247da7d4b8cdebe55916
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            306576d717ffd37eafe10914dfa5a51301f3d5c701ef2416cc36b16a83520ccd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5588676
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtdeclarative qttools sqlite-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qttools qtmultimedia qtquickcontrols qtquickcontrols2 sqlite-plugin"
</span>         {"Qt Reference Documentation"}
         "requires all documentation"
         "variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,9 +251,9 @@ array set modules {
</span>     }
     qtgamepad {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            670974f3b6f98f316e9b9c62edf038068f71d5d2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            e99590cc14e7fb98caf7b48ddf8515f3e32388af3024659d46047f143a1342cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            385444
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ff97dfccae48b620824668501af9a91629c034ba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4c1900b9917dc18584b2287cd7382f0668d71237ef8e71e3feb4d457c2b56091
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            385484
</span>         }
         ""
         "port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,9 +266,9 @@ array set modules {
</span>     }
     qtgraphicaleffects {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            dec2489cadf3b31b31ba511828b78fc0774b3444
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            14d86983fcdd119daefad235ffee7d8ca691e6074ef360cb6347b8aae66f57e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            14267588
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            aa6e1c8b9059f9edee311d617aadf187e5b9105e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            81058fb12d4dd019bed6bb196a13ea5d308a390d72a1468da11171f8c3003455
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            14270812
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,9 +281,9 @@ array set modules {
</span>     }
     qtimageformats {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            d8cc5a9d76ae8cc72f07d52aa618df5755fa39b6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            04b261bc3d7a277fbe9ac8619ecd037d7089b356eaee41b2d41d7a2ff58b087f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            2197304
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            c5552608b6f482f9b8e2ced76e3d3cf58f82bacb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5f907de96d3db6276816f321b7e11cba7beb1fcc81bcb3f1729cde3b7599732e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1774820
</span>         }
         ""
         "port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,9 +296,9 @@ array set modules {
</span>     }
     qtlocation {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            6bf01d3492453a24e9b5837b8c849f1d797820a3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            58e498a5b496e3a38925398b244bbd57ba68cbb482f2a0d2ae51572e037100eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5589440
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ec71fed7b1e254906503e2986256382c1547d576
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            b0a3134df3a00f6045405d3c12e0ea3ae7e640feaf38e238873df85424674449
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5898856
</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;'>-            8ec0a01dfc0dc66209672e55a26defe397fdda6b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            930e26f80b330e110ad31de458d3b6e8db23170875b18a7eda2873cd59c53ac9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            68932
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            75efbe705582ba2926197f1c49eb11a93452b37e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            d90a7ba25543503ed40f6c248780b6859254536735d8f87fe5598f688c9cb003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            68592
</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;'>-            2f55a52681e5b58a49800c717930bf87a37a2552
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            728078eff7dc21495d704a7cd17c604d74604604b45a3c58271608f90dea3c41
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            3710012
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            e56e7d38cb9ca5f3b429ff9451162b00b1b7027c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5c4b0cb9c08c57ce1aad3aee267c6f6270d254addfb2a6dd363a272e98e926a9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            3716764
</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;'>-            9923d03afd7b17c91e1da7272dfd991e05257d1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            a060d0c3da56ea1e651d80ea1fa52b89544f059551c45d4e4ae87d8e9229a335
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            138740
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            87f8de8c34beaa08303f6dbb7812976e33c231ed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            41111946f40ee110b789f365a398c3f27bc4fd6c0f9a8b1a72b79c81543e0775
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            139012
</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;'>-            93f9e4a03ef038d30ed6eaca7030d3f282503670
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            16cdd3751b18400715d516cd9836d687d811071101d7c8634030d7225b7fa0b9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            207696
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4615c4941c32602a707f2fec8e576493421dca58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            d90bed1ec3e937255246873831f035684723f54fe91124ed7239ec43c46d60da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            207680
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,9 +371,9 @@ array set modules {
</span>     }
     qtquickcontrols {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            d4fda13bd500f53ff952f8e1aa38de0a7ba184cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            4e4e5da02ab0b06d35b09356170013cfe36a773d15f92281f7e6d085c3f07537
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            6053336
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            b95370caa1f46b337b994ce03158e5e31045835f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2bfb63240beed6926be429310e91b33df836fe38bcaf9de6883d5e781511cd73
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6054956
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -386,9 +386,9 @@ array set modules {
</span>     }
     qtquickcontrols2 {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            bb52a10a3160812d269b109f7e591d546b462911
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            f45630b652585b62204405b28432977e67c148ca5f1789a794654fd6c1bad086
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            9042632
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5e20609dc4220eb59ce139899fe6ec1825ab1892
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            89777e2ee89a08d203e0e394be0c47dc52008ea58506f4b3bdf1a696c5907dc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            9279804
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -401,9 +401,9 @@ array set modules {
</span>     }
     qtremoteobjects {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            3c31c5a561c0d801565bec03bb399c8e31d6af9c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            f70306a78f440516eaacd6908140bc469ebd101a61c724b9590f4aefbafe72b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            319240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1962e22d8cb2ed851780e04b92d1aa497b70d4ca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            0940d0a4a961b64f38c52a2e5638c2b3341fe46bd6bd88d1c638707f42159d5f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            335472
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -416,9 +416,9 @@ array set modules {
</span>     }
     qtscript {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            73b35a78251b6a4ddcfb5790e4ba06ce95e354e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            bb84f3cc581078df4ff76705c5623cd88287f70f7405cbccf99e6fb6dedbec08
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            2674692
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            a22f566b64a81a03ef898a4a49fa095837af82d5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            97fe1a22e5d0e89d3850546c0771fe41707d4c40062dc16fae8e21bf6f8cffa8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2674336
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -431,9 +431,9 @@ array set modules {
</span>     }
     qtscxml {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            debc70cdb4f558afaf3dd62f3118b80a5cb80854
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            13172767eda404f1b71ab35998a95af6633d700d2417fff3648d8c6dc6af68d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            433500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1046d997677970c74498e8d6de126d2da0796831
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            dc6ece52669976836844b0d9bcf4910bca7b5d2c446c6755d7b9f79bfa1add6b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            433896
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -446,9 +446,9 @@ array set modules {
</span>     }
     qtsensors {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            a8ce4b6a1b8c3fa51bca8f8ae65dbb4d58359882
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            a75753d1d5607d4cb27b1849ea9612a65bb3a5271bb31bf0817edd143b620859
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            2031168
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            a21cb60c341403c548eebcdd3d804c23a26d367c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            c53132847a1f70d5a4c5fe689a9943d8afae3f3648bf5b0d824015093addc5a6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2031092
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,9 +461,9 @@ array set modules {
</span>     }
     qtserialbus {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            80de0ccfe92b233db99e45368f817732d55eaba7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5664def35d4ad4aedef14bc529679851450262ea81477a69031ba81aa614c16d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            318484
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            41ca8c4e617ff6f0254696480cc8532c01b9d038
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6b9286c9762341a48c636da62fecb7b76168a4634e44508b42c19eb0058a359a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            324680
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,9 +476,9 @@ array set modules {
</span>     }
     qtserialport {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            5b33eb52afc6d317bdd424b92086246d1b4af858
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            96c45e6d0d470626815f82b38ee48bf941e1bbfc10863087b69cc5f7bb766bda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            299140
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ffbc581bb9ff99f3b576b4c10ae8010659c30e8d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            59d4005695089c6b50fc5123094125d9224c1715655128640158a2404075a9bb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            298892
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,9 +491,9 @@ array set modules {
</span>     }
     qtspeech {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            0b6b18f6b31d88a693f8259a398659c3b3350e17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            b92fd9ae33d78b6a080e154c80208c8998e3481bec4b84dc2be56dd0f03f1795
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            99516
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            e5d5104b239e7faf47b25205fd1ed1d98f857139
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1939a2ece528b115e4682dba7fa7138c132c62bb88db7d1f3552c543a1e2a4fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            99696
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,9 +506,9 @@ array set modules {
</span>     }
     qtsvg {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            3e8d5fe2d4ec7ac21918320a4c9e53b27caf0299
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            21ea2c9c4e78101e98163bc19e463b8d8cdffa20e1ccd523ccc925b9f2cd4491
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1845004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            f1bd9553d623cdc9e5996c6904491d439a24ac1a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ebe68d8ad73b6b8d8eabac81edcbf395838caf4d498d6b047c74b57341c3fbce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1845656
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,9 +521,9 @@ array set modules {
</span>     }
     qttools {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            c80a783a16a31100884f6096ca9eef6a0231018e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            c205e81bba9b87c6186604a05ab48e4e6cac0cd511525749dfd00b107b6f9f8e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            9705920
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            3b2f2f598d1b5af1e4ecb8a0fed1ec59e1f25274
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            574ce34b6e5bcd5dce4020a3947730f3c2223eee65d0396a311099223364dac3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            9775520
</span>         }
         ""
         "port:clang-7.0"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -536,9 +536,9 @@ array set modules {
</span>     }
     qttranslations {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            e52948b5957cba3bde90487200fcb526cd8e8988
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            fa84b284d8aa34d6076b5e87a33ba6eb2382b69c371089c1c25b88bfd4141149
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1424160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            d6cba02e157d58e7ab5312ac03b6246b828abba6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5b4f186e0b96703041319b5b131393b6aa829ea74e067697ede548d936327508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1424236
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -551,9 +551,9 @@ array set modules {
</span>     }
     qtvirtualkeyboard {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            fc4dc27446ef79876158c5eb3615cac6eaa40611
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            8c5c40245a9dd2e9e504ce2d47d45079d8280436146797b24b8115ef163b4b9e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            10698520
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1777a7030f346a18e0cdda2439f7d8a5011f3e4b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            db93b89ba13ec1a688850f456be9f10037033cebf7b4deb151ed9f5322d0d6da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            10913328
</span>         }
         ""
         "port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,8 +566,8 @@ array set modules {
</span>     }
     qtwebchannel {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            7192689ff316bc6259ab887971360ee87dcbb6ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            3c254fa41b1af09c1e951131f3a1336dee70a15cbb8a82112488b38d29572df3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            3540a2a9ce6c6637623c834b2e74b2cd3c0cf1d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            851af30ab951c7543c82640f46686227b244331ebf9235f963edcb7e5a184bf0
</span>             177328
         }
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,13 +581,13 @@ array set modules {
</span>     }
     qtwebengine {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            dca53ea8b12782d4bc35a749ca4b6ff2cb22d20e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5bb49ead71b851db4dc56f8fd97e0db72a268b22104129a06bac201d55d3b8fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            233678844
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            e168bc2432543be171b8b78d3bf9ef708d2d479d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            bd581e390a30e0f74d41b0e3334b3cf612dd4af23de36a3bf5931d5b4453687c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            252044400
</span>         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "port:python27 port:py27-ply port:ninja"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtquickcontrols qtwebchannel qtlocation qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "port:python27 port:py27-ply port:ninja port:gperf port:bison port:flex"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "port:fontconfig port:dbus port:harfbuzz port: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><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel"
</span>         {"Qt WebEngine"}
         "very large and relatively new"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -596,9 +596,9 @@ array set modules {
</span>     }
     qtwebglplugin {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            30aff3a53561b651e77ee3003a5fd3e7367961d8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            691d4c99a15b110369a080af59c95c3481c08149e55fe0bf73f7c4ca3c451f73
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            67452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ffbb4987aa10a938c1dd5438b6cd87424a8f3ba7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            65223ad13a46e38343a621459a60ea25bc9e74d6549bf62a2d54d839c66b652e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            73260
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,9 +641,9 @@ array set modules {
</span>     }
     qtwebsockets {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            2dbadad1a81bcb578ec2c8252348054a8a31a365
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            021090c1a92f11fcf2914168741c1364235896793685b7fae2bc23e3dd55d5b9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            229368
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            a23233f837eabb4710c2827b204c8e587f1b0fe3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            444da1c1d32910738a01b8251c1ccc3ffe4df148f125bb4af532b247ad74fc3f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            230980
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -656,8 +656,8 @@ array set modules {
</span>     }
     qtwebview {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            2bcc7f5288d2b1d8b35dca4617a015453ebb563a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            7026f6e5e8f7c0adea4743004eb945adeb65bec00c95cf50abe4b6016cb055da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ef9a5ac5956ae4ff04405869ad7688668a881295
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            b7a82cc4edf9361d64155f0ec7848b37c947e0cfe9a9f03efe8af515c6326185
</span>             130676
         }
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -671,13 +671,13 @@ array set modules {
</span>     }
     qtxmlpatterns {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            c10f813b53b43c7eb00ace7da02b509b13c98b77
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            8bd00be30722570d22382b99679d07787a2d62d4891d1c47d738d634e2db0eee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1373016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            9b29676bec7f53cf3146b098967e89eff8eeb666
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            f36279bcafb8052a0b60edd473e1d341b4733a43eb26239848b4382303679375
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1389248
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt XML Patterns"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -781,9 +781,9 @@ build.env-append \
</span>     PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
     PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 15 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 16 } {
</span>     pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_error "${subport} requires OS X 10.11 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ui_error "${subport} requires macOS 10.12 or later"
</span>         return -code error "incompatible OS version"
     }
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -861,11 +861,6 @@ foreach {module module_info} [array get modules] {
</span>                 }
             }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # undo part of https://codereview.qt-project.org/#/c/140954/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # .pc files still needed by some ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # see https://github.com/Homebrew/homebrew-core/blob/master/Formula/qt5.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            patchfiles-append patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>             # see https://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
             # only runs test code on 32-bit systems
             patchfiles-append patch-tst_benchlibcallgrind.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -967,11 +962,9 @@ foreach {module module_info} [array get modules] {
</span>                     ${worksrcpath}/mkspecs/common/clang-mac.conf
 
                 # respect macosx_deployment_target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                foreach spec {macx-clang macx-g++ macx-icc} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/${spec}/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/mkspecs/common/macx.conf
</span> 
                 #respect configure.optflags
                 reinplace \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1003,11 +996,9 @@ foreach {module module_info} [array get modules] {
</span>                 } else {
                     set arch_replace ${build_arch}
                 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                foreach spec {macx-clang macx-g++ macx-icc} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        "s|__MACPORTS_DEVICE_ARCHS__|${arch_replace}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${worksrcpath}/mkspecs/${spec}/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "s|__MACPORTS_DEVICE_ARCHS__|${arch_replace}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${worksrcpath}/mkspecs/common/macx.conf
</span>             }
 
             # use MacPorts X11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1384,6 +1375,12 @@ foreach {module module_info} [array get modules] {
</span>             }
 
             # special case
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { ${module} eq "qtwebkit-examples" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # in Qt 5.12, qmake changed how it generated Makefiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                patchfiles-append patch-qtwebkit-examples_header_location.diff
</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 "qttools" } {
                 # prevent qttools from opportunistically using qtwebkit if it can be found
                 patchfiles-append patch-no_qtwebkit.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1432,10 +1429,10 @@ foreach {module module_info} [array get modules] {
</span>             if { ${module} eq "qtwebengine" } {
                 # see https://doc.qt.io/qt-5/qtwebengine-platform-notes.html
                 PortGroup           xcodeversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                minimum_xcodeversions   {15 7.3}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if { ${os.major} < 15 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                minimum_xcodeversions   {16 8.3.3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if { ${os.major} < 16 } {
</span>                     pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ui_error "${subport} requires OS X 10.11 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ui_error "${subport} requires macOS 10.12 or later"
</span>                         return -code error "incompatible OS version"
                     }
                 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1445,20 +1442,18 @@ foreach {module module_info} [array get modules] {
</span>                 build.env-append      CC=${configure.cc}
                 configure.args-append QMAKE_LINK=${configure.cxx}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                # see https://chromium.googlesource.com/chromium/src/+/cd7154e0bb5f3ca9c72586da79f87d13afb5361a%5E%21/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                patchfiles-append patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # either have VNRequest forward declarations or include correct header file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                patchfiles-append     patch-qtwebengine_forward_declarations.diff
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                # the following libraries, even when available, do not seem to affect the build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # so turn them off
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                configure.post_args-append  \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --                      \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -no-pulseaudio          \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -no-alsa                \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -qt-webengine-icu       \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -qt-ffmpeg              \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -qt-opus                \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -qt-webp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # do not opportunistically find MacPorts libraries (e.g. X11 libraries)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                patchfiles-append patch-qtwebengine_tests.diff
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                configure.post_args-append         \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --                             \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -webengine-native-spellchecker \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -webengine-kerberos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -system-webengine-icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -system-webengine-ffmpeg
</span>             }
 
             # special case
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1886,8 +1881,9 @@ foreach {component component_info} [array get qt5pg::qt5_component_lib] {
</span> # Qt 5.8 will not work on OS X 10.8
 # Qt 5.9 will not work on OS X 10.9
 # Qt 5.10 will not work on OS X 10.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# replace qt5-XYZ port with qt5{6,7,8,9}-XYZ port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt 5.12 will not work on OS X 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replace qt5-XYZ port with qt5{6,7,8,9,11}-XYZ port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 16} {
</span> 
     if { ${os.major} < 12 } {
         set qt_replace_version 5.6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1895,8 +1891,10 @@ if { ${os.major} < 15} {
</span>         set qt_replace_version 5.7
     } elseif { ${os.major} < 14 } {
         set qt_replace_version 5.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif { ${os.major} < 15 } {
</span>         set qt_replace_version 5.9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set qt_replace_version 5.11
</span>     }
 
     set qt_replace_name qt[join [split ${qt_replace_version} .] ""]
<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 d3aa12e..87d9d47 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;'>@@ -13,30 +13,23 @@
</span>  QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
 --- mkspecs/common/macx.conf.orig      2017-06-28 02:54:29.000000000 -0700
 +++ mkspecs/common/macx.conf   2017-08-27 07:11:49.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,10 +3,10 @@
</span>  #
  
  QMAKE_PLATFORM         += macos osx macx
 -QMAKE_MAC_SDK           = macosx
 +QMAKE_MAC_SDK           = __MACPORTS_MAC_SDK__
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_MAC_SDK_VERSION_TESTED_WITH = 10.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-clang/qmake.conf.orig     2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-clang/qmake.conf  2017-08-27 07:13:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,9 +2,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # qmake configuration for Clang on OS X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
</span> -QMAKE_APPLE_DEVICE_ARCHS = x86_64
<span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span> +QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_MAC_SDK_VERSION_MIN = 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_MAC_SDK_VERSION_MAX = 10.14
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Opt-in xcb QPA support with XQuartz:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,8 +25,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/macx-clang/qmake.conf.orig     2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/macx-clang/qmake.conf  2017-08-27 07:13:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,8 +21,8 @@
</span>  # and X11, OpenGL is currently not supported.
  
  QMAKE_LIBS_X11 = -lX11 -lXext -lm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,34 +40,6 @@
</span>  
  include(../common/macx.conf)
  include(../common/gcc-base-mac.conf)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-g++/qmake.conf.orig    2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-g++/qmake.conf    2017-08-27 07:14:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,9 +10,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG                 += app_bundle incremental global_init_link_order lib_version_first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_INCREMENTAL_STYLE = sublib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_APPLE_DEVICE_ARCHS = x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/macx.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/gcc-base-mac.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/macx-icc/qmake.conf.orig       2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/macx-icc/qmake.conf    2017-08-27 07:16:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,9 +98,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_APPLE_DEVICE_ARCHS = x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(../common/macx.conf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span> --- 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
 @@ -6,8 +6,8 @@
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 29d9b90..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Partially reverts <https://codereview.qt-project.org/#/c/140954/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git i/qtbase/mkspecs/features/qt_module.prf w/qtbase/mkspecs/features/qt_module.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bb28af97..36bb6483 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/qt_module.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/qt_module.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -266,7 +266,7 @@ load(qt_installs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- load(qt_targets)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this builds on top of qt_common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--!internal_module:!lib_bundle:if(unix|mingw) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+!internal_module:if(unix|mingw) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     CONFIG += create_pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     host_build: \
</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 930bd27..192bb49 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;'>-@@ -109,7 +109,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,7 +110,7 @@
</span>              "label": "OpenAL",
              "test": "openal",
              "sources": [
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff b/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b41828c..437654a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtvirtualkeyboard_noxcb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> --- src/virtualkeyboard/virtualkeyboard.pro.orig  2016-11-28 02:45:25.000000000 -0700
 +++ src/virtualkeyboard/virtualkeyboard.pro    2017-06-20 07:13:44.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -297,10 +297,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -405,10 +405,10 @@
</span>      SOURCES += desktopinputpanel.cpp inputview.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     HEADERS += desktopinputpanel.h inputview.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     HEADERS += desktopinputpanel_p.h inputview_p.h
</span>      DEFINES += QT_VIRTUALKEYBOARD_DESKTOP
 -    !no-pkg-config:packagesExist(xcb) {
 -        PKGCONFIG += xcb xcb-xfixes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,5 +13,5 @@
</span> +    #    DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
 +    #}
  }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += appinputpanel.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HEADERS += appinputpanel.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ record-trace-input {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_forward_declarations.diff b/aqua/qt5/files/patch-qtwebengine_forward_declarations.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1e973c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_forward_declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ 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:#e0ffe0;'>+@@ -262,8 +262,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Once Chrome no longer supports OSX 10.12, everything within this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // preprocessor block can be removed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(MAC_OS_X_VERSION_10_13) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#if !defined(MAC_OS_X_VERSION_10_13) ||                 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // VNRequest forward declarations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @class VNRequest;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,7 +328,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property(readonly, nonatomic, strong) VNFaceLandmarks2D* landmarks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif  // MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#endif  // MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // ----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The symbol for kCWSSIDDidChangeNotification is available in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // CoreWLAN.framework for OSX versions 10.6 through 10.10. The symbol is not
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f503b97
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,242 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.tests/snappy/snappy.pro.orig    2018-11-26 21:10:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.tests/snappy/snappy.pro 2018-12-08 12:40:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-linux:SOURCES += snappy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SOURCES += snappy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -lsnappy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/configure.json.orig   2018-11-26 21:10:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/configure.json        2018-12-09 10:07:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,87 +334,87 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "features": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-fontconfig": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "fontconfig",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-fontconfig",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && libs.webengine-fontconfig",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-dbus": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "dbus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-dbus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && libs.webengine-dbus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-libdrm": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "libdrm",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-libdrm",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && libs.webengine-libdrm",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-xcomposite": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "xcomposite",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-xcomposite",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && libs.webengine-xcomposite",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-xcursor": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "xcursor",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-xcursor",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && libs.webengine-xcursor",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-xi": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "xi",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-xi",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && libs.webengine-xi",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-xrandr": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "xrandr",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-xrandr",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && libs.webengine-xrandr",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-xtst": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "xtst",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-xtst",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && libs.webengine-xtst",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-harfbuzz": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "harfbuzz",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-glib" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "glib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && libs.webengine-glib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && libs.webengine-glib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-minizip" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "minizip",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && libs.webengine-minizip",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && libs.webengine-minizip",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-zlib" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "zlib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && features.system-zlib && libs.webengine-zlib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && features.system-zlib && libs.webengine-zlib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-libevent" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "libevent",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && libs.webengine-libevent",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && libs.webengine-libevent",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-jsoncpp" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "jsoncpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && libs.webengine-jsoncpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && libs.webengine-jsoncpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-protobuf" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "protobuf",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && libs.webengine-protobuf && tests.webengine-protoc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && libs.webengine-protobuf && tests.webengine-protoc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-png" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "png",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && features.system-png && libs.webengine-png",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && features.system-png && libs.webengine-png",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-jpeg" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "JPEG",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && features.system-jpeg && libs.webengine-jpeglib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && config.unix && features.system-jpeg && libs.webengine-jpeglib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-python2": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -458,7 +458,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-alsa": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "Use ALSA",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && tests.webengine-alsa",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && config.unix && tests.webengine-alsa",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-v8-snapshot": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -474,17 +474,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-khr" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "khr",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && tests.webengine-khr",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && config.unix && tests.webengine-khr",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-libvpx" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "libvpx",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && tests.webengine-libvpx",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && config.unix && tests.webengine-libvpx",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-snappy" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "snappy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && tests.webengine-snappy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && tests.webengine-snappy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-winversion" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -494,13 +494,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-geolocation": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "Geolocation",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "module.positioning",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && module.positioning",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "publicFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-pulseaudio": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "Use PulseAudio",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.pulseaudio",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && libs.pulseaudio",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-pepper-plugins": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -577,31 +577,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-libwebp": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "libwebp, libwebpmux and libwebpdemux",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-webp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && libs.webengine-webp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-opus": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "opus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-opus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && libs.webengine-opus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-ffmpeg": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "ffmpeg",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "autoDetect": false,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-icu": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "icu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "autoDetect": false,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-icu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && libs.webengine-icu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-re2": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "re2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "tests.webengine-re2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && tests.webengine-re2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-ninja": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -617,12 +617,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-glibc": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "glibc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.linux && tests.webengine-glibc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.linux && tests.webengine-glibc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-libxml2": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "libxml2 and libxslt",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                          && libs.webengine-libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                          && tests.webengine-libxml2-compatible",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -630,17 +630,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-lcms2" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "lcms2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "autoDetect": "features.webengine-printing-and-pdf",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && libs.webengine-lcms2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && libs.webengine-lcms2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-freetype" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "freetype",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && features.system-freetype && libs.webengine-freetype",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && config.unix && features.system-freetype && libs.webengine-freetype",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-system-x11" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "x11",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "config.unix && libs.webengine-x11",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "!config.macos && config.unix && libs.webengine-x11",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-sanitizer" : {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -652,7 +652,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-poppler-cpp": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "label": "poppler-cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "autoDetect": "config.unix",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "condition": "libs.webengine-poppler-cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "condition": "config.macos && libs.webengine-poppler-cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "output": [ "privateFeature" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "webengine-win-compiler64": {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_xcode10.diff b/aqua/qt5/files/patch-qtwebengine_xcode10.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index af376d2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,94 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mac: support build with 10.14 SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Two changes are required:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1) Explicitly upcast the result of dispatch_get_global_queue() to a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dispatch_queue_t*, since it changed to return dispatch_queue_global_t*;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2) Add empty implementations of the new methods on ICCameraDeviceDelegate for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ImageCaptureDevice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TBR=maxmorin@chromium.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug: 849689
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: I9448d1b07f8d4116ecdb0c75a7796472e51c6dd8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-on: https://chromium-review.googlesource.com/1087169
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Robert Sesek <rsesek@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Tommy Li <tommycli@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Cr-Commit-Position: refs/heads/master@{#565040}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/components/storage_monitor/image_capture_device.mm b/components/storage_monitor/image_capture_device.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af289bd..831cb65 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/components/storage_monitor/image_capture_device.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/components/storage_monitor/image_capture_device.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -231,4 +231,38 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  name));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// MacOS 10.14 SDK methods, not yet implemented (https://crbug.com/849689)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+      didRenameItems:(NSArray<ICCameraItem*>*)items {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  NOTIMPLEMENTED();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)cameraDevice:(ICCameraDevice*)camera didRemoveItem:(ICCameraItem*)item {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  NOTIMPLEMENTED();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    didCompleteDeleteFilesWithError:(NSError*)error {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  NOTIMPLEMENTED();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)cameraDeviceDidChangeCapability:(ICCameraDevice*)camera {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  NOTIMPLEMENTED();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    didReceiveThumbnailForItem:(ICCameraItem*)item {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  NOTIMPLEMENTED();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    didReceiveMetadataForItem:(ICCameraItem*)item {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  NOTIMPLEMENTED();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    didReceivePTPEvent:(NSData*)eventData {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  NOTIMPLEMENTED();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end  // ImageCaptureDevice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/media/audio/mac/coreaudio_dispatch_override.cc b/media/audio/mac/coreaudio_dispatch_override.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2ac812b..34d1ad2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/media/audio/mac/coreaudio_dispatch_override.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/media/audio/mac/coreaudio_dispatch_override.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   const void* replacement;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   const void* replacee;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+using DispatchGetGlobalQueueFunc = dispatch_queue_t (*)(long id,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                                        unsigned long flags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }  // namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This method, and the tuple above, is defined in dyld_priv.h; see:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,8 +178,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   const auto* header = reinterpret_cast<const mach_header*>(info.dli_fbase);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   g_pause_resume_queue =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       dispatch_queue_create("org.chromium.CoreAudioPauseResumeQueue", nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  dyld_interpose_tuple interposition(&GetGlobalQueueOverride,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                                     &dispatch_get_global_queue);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  // The reinterpret_cast<> is needed because in the macOS 10.14 SDK, the return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  // type of dispatch_get_global_queue changed to return a subtype of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  // dispatch_queue_t* instead of dispatch_queue_t* itself, and T(*)(...) isn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  // automatically converted to U(*)(...) even if U is a superclass of T.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  dyld_interpose_tuple interposition(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+      &GetGlobalQueueOverride,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+      reinterpret_cast<DispatchGetGlobalQueueFunc>(&dispatch_get_global_queue));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   dyld_dynamic_interpose(header, &interposition, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   g_dispatch_override_installed = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   LogInitResult(RESULT_INITIALIZED);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebkit-examples_header_location.diff b/aqua/qt5/files/patch-qtwebkit-examples_header_location.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1fa96bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebkit-examples_header_location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/domtraversal/window.ui.orig     2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/domtraversal/window.ui  2018-12-14 16:26:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-   <header>QtWebKitWidgets/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <resources/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/simpleselector/window.ui.orig   2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/simpleselector/window.ui        2018-12-14 16:26:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-   <header>QtWebKit/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <resources/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/previewer/previewer.ui.orig     2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/previewer/previewer.ui  2018-12-14 16:27:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-   <header>QtWebKit/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <resources/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui.orig    2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui 2018-12-14 16:28:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -188,7 +188,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-   <header>QtWebKit/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <resources/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- examples/webkitwidgets/formextractor/formextractor.ui.orig     2017-05-10 10:07:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/webkitwidgets/formextractor/formextractor.ui  2018-12-14 16:28:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,7 +151,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   <customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <class>QWebView</class>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <extends>QWidget</extends>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-   <header>QtWebKit/QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   <header>QWebView</header>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   </customwidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  </customwidgets>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <resources/>
</span></pre><pre style='margin:0'>

</pre>