<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/1e466935364a50fbba98e7affd60feb3b8289bc1">https://github.com/macports/macports-ports/commit/1e466935364a50fbba98e7affd60feb3b8289bc1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1e466935364a50fbba98e7affd60feb3b8289bc1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 10 17:46:03 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: update version 5.11.1->5.11.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apply upstream patches.
</span><span style='display:block; white-space:pre;color:#404040;'> See https://chromium.googlesource.com/chromium/src/+/cd7154e0bb5f3ca9c72586da79f87d13afb5361a%5E%21/
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57193
</span>---
aqua/qt5/Portfile | 218 +++++++++++++-------------
aqua/qt5/files/patch-mkspecs.diff | 8 +-
aqua/qt5/files/patch-pc_files.diff | 2 +-
aqua/qt5/files/patch-qtwebengine_xcode10.diff | 140 ++++++++++-------
4 files changed, 198 insertions(+), 170 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 f405f45..6068004 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.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.11.2
</span> set middle_name everywhere
if { ${subport} eq "${name}-qtwebkit" ||
${subport} eq "${name}-qtwebkit-examples" ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,9 +131,9 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b2933b790ffe52b09c425f588be86c32f19d0a68
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cb8659e1e5541bea4c3684ac76a496f8e0cd6e3aa9e4e22eba1910095f5ed30d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 84763568
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7381d2223db6106e48d2f3ac0f3a99834ceb1027
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7f72c823ec10a2effba95d08d9439215472d2cb1e3229de50a6b3d2523c8f962
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84932180
</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;'>- 0da6d6fda6770279313218185225bdcda8ea53ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 46860400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dcbc0b2dcba794c243253be747f7d624b4ef9459
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 46954920
</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;'>- cc5693fa06e449cbf963a441a8930f4eb72eb6db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0fb51102bdd595673e2cc4f4878b8fb8b7da4c8b1f026885a75912e2421d2ede
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10931700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 58f7760a20ef7874be673275118e7c0490dc6d99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fd9ca31268e81d4864da961de7635ef7316a815b8fc77910e512647eb4ceea40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10909652
</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;'>- fc82887553939a276b81aa435024941e01136583
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 62f65f08b08c1fdce4f358103be1f7d7aba54d21774e1a9bfff91314ad667a2b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4245496
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8bad62ecb73dd10ae48a64878c09ec550bae967b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f6a312c596bfffa5074a3a5606dff1ef197dac075b3c1bd6443e3a6db1c3a114
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4239784
</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;'>- 3bcc1eda3e441cbbbe5d91775ff4b94f670c2cb2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 738ed4eb058334fe7cfd6d68f2e2e7c9b2a97f3477b36ae26ed82703dcaae657
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2734864
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c3d113ae7a2cc959daf1899067e63b0ff7b6a666
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 58901bbd14d3bc472f27fe305fd8dc33cffbd10da83616e9691c04c3290d42c5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2729556
</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;'>- 83e476c507df484f5a684eff6a94d04db7fa5783
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1c9da0876e0058bff1c24e0088505aff469e2e2cc983143acdae17f075035e3d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5206688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d31e4253c2ed9e63cfa8d39914c3e5e66b04447f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 67b499d2aa3cfb9cca33c08d89623d997ed92de5307745b6a2b2c3be61deff16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5196328
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,9 +221,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bb7dc3b6b40a67a9f981ff1eed6ba6cf719cc214
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9ecf5ef6bf618fcb6719a4b22e3d9f9ce7623c2344667038171d5662624c4f3a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 22203488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 67be20bd74bfca77aa79520f1d55d3a749c269e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 220d86f8031e9d45f3c369c3fd517aaa4c5783ad62c843a21fa7cc3c0a36f2cd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 22217460
</span> }
"port:python27"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,9 +236,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 039aef1dc656ed5c7c357996ffd117d186601133
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- acde1b7c1d1d0bdaef492fed39aee12c949050d42fa2d89827aff00b6cc51afc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3328164
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bf258888d8e2e784a852ba6fbaaa279386f25ecc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2186971f9399c8f4cafe1109a8e63c363cd288c9a645717a6f8a069dd1d370fe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3327968
</span> }
""
""
<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;'>- 63b5090a73beefd5b04d0441dddfcd687e12c361
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aaf219667f87d07a216bd30374013f97deea964471d827f7fc15bdc572e227d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 387640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 573a41a75c688d1df6c68a915ee4b0b6436d012e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ae2f378e1739ff527b5cd3b014ad26112d7b8a80444c9aefbc4736e52339c81c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 381908
</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;'>- 16a5cf6dab9d03edf923041f8419c6fcb7182a7b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d9d27236696221098e832d6fee8c0fbb2834b1670d9ca1e5bf3d0fbc8e5448f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14272760
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0eb7ffe54fbafedfa0eca8c47266c245673a6030
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a9dcaaa3932f7b71717a393700e1387bcd6f9c03538d0ffca2a64128a0e4a9fd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14262460
</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;'>- 3d548c33e3a8b31b785a88934ae75186ff3d83d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eb50deeccce12ede0a5faeb3e411f34920ba43092c65f063ab23d37970f65616
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2191408
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 53bc3849cbd6719f4f0405f26daf028c2945ab76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 27e5d10551d0b5bf4799d09e5412ea2e6898b09aa1521ea24bce660ee6183a68
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2183956
</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;'>- aef55997be298042c248d45b824c25f69771f303
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 172c9a39e8267739e20d60bda45de3db02b13163245776bdc696d8c5ab5f790f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5593144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 130106e7493f074cea5bf5618a22579c56cac542
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d698911edfb2d45b7adca6557b3de880e966cb8823a8adf1beb3a3079560024e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5584420
</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;'>- f2f654d11b6f864b96fc8eb77420ca018d8a559c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f63e31ec68d72c185ad7374f3c74c1e8693dabaf14212cadac0fbd476cb1c3f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 70976
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 89ce8ba19e0b8627e5fd3f0957447d4406bfe3d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 44f69d019ddadece89552db0ea465824eb76227d92b7decac909945fff8dcf4c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 65276
</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;'>- 9aef23a9a578e7cb16184890055c5d713992cbfa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f28bb57890b4666a9aafaa116a30c51dedb0f23b60a510280a27eb032b58c90c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3711548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 941139f2f7a281a67572886a6b240aa844e6c4ee
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 25608f3d08636026387394956fe72cedcb78eb786fb32fd87deb41d574cf726d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3701832
</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;'>- b1b0374db0b1c5c1c1f8c627b8c70f5a7684acc9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 02b405e9b1af27e3dd986f9a2e4ed987bd9586bcdb2a529a08a6cc71ddbee416
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 140468
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f9b60337f0e4b87d8cadf0e4bd63fac0f3b7cf04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 79379cef7801fb909ed1cd23379eaef6b2d2ca31581aa537cab64ee1e0dcb7fe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 135160
</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;'>- 426b842a2f844e6a3df394a12db7e0a13866f1e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac99abb83194b3b38f1bd7fd4458a4b32765e7dc7d515941d016abe45d1a3533
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 209828
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7e1cedd6cdfc43623bb9c23a50efbc7f7fed83a3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2d7189242eded07be4aec473501d3cc6a9e2bd7849f81b1bb6b01604ba0f8df6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 204216
</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;'>- 78dee5f3b939eab3ccc38f5be689773d95520731
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- baea7f59513ffade3f8041c1756722334b7d04245667fa8faaeace07a430c656
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6058072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 271a70c0c75f7f8a17b0e3414fd7f84b83024ea5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9c772e30fb1ba107168498328585063f4303c6562baf4a5cfedd0c5250b621e0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6047528
</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;'>- 573d499b3fc63496fc14c45dbab1ac3d08b2d64b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bdb066fa0d51ad36a2c756d4cba63892587638e5df9b9b6ee63b963ff39ec442
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9032192
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 768b9a961891710a5385e4fbc4da3de2078de4a5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aa0549f9a4135f9d600b57f53347ebf344e60d21f90c6d844109755da12dcb84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9035620
</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;'>- aef08431c117f7b44dda79ae40f4b9edf5dc3feb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eb2d69c662cd828a11d248e61742e3e494507e640757ec63dc64db24867069fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 321092
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0c78e69bd657c13ac435e1ccb06e43fc18e574c1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f2bc6d65f4d4b90fc222c0fd0539120f29452b6d336171930f90e5129cd25c19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 315708
</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;'>- 7ec180957d0e4ada3189b1fae06f5a4db0664c54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1c430fd06e8eb25dbca43422453a16588d1aade936770df2e4b4e8961659da7c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2671428
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ df42406013dc91b64fe71b0db88b8ff78b7498d1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b2c2466a83653a9473ea4810462d8a88e0fb1fb691f85d1c6e60d8bc4283f976
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2661200
</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;'>- 3e6081fdbbeadcf242b032f075369204e150ece2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f0463f02c0bb81d214b04ec82ff0d22744cdae1966cd8dfb53cd2b31ad233338
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 436148
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aa6c803ddfe7c0563cd46b9afa4e89705f4402c1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d625cb2149f5bfef5747b1d40b22327fd36132307c8b76d358f235d5422ff7a4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 430496
</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;'>- 80eb1fced496f688db013d936882ddf9cca676dd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cbe90f58b73c344d67098eaa333f2d2562fa7a9f1794448e7543ff696831c0fa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2033508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d37f87d9828a553918bc706dfdc161b6fa389ef0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0e27c38824f7a1deb506f6195156eed79b80aa7034356272c3be0611667d63c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2028412
</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;'>- 300b9552dd54d89ebc842a229eee88c019eb34e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d3bbee3c579a6d7a06956d653bcdfc2e2cd054d639dcaff08f45efb94d6b554a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 320844
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1a598c86a6de29d8850d808045135cc4a7a2f42a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1774c2c162f85f7cbcb2bdd2ef47507b110a01bc261627b46aa718e87079641e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 315080
</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;'>- ff03a91ce1665b46347502490c584e662c210115
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 56a7993821d556d84494c6dfc22759eb6f2a979e21685403a2b9da75f0ba64a3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 301692
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e197a2c28942528f52f755da8820d43461bbfebd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b01b69ce421d449402363c0cf617fcc8856e39d6d2c28aa3d06d1f5359dc6f6e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 295876
</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;'>- 9263344e9b38c3c4b7f3aabe0e9c2aae4a1a06ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dcc782c7d6693b0874881cf6ccc7269681bd8bf5f6e1a83c4ab18c27a35a9bdb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 101732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5ce3eb98716d9f4ecf24dc64b1f6c0005f080f93
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0abd6f9672cbea3597e88db99813d7a4d7d379b89f6be352f44a9313bcc81d84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 96080
</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;'>- 904b69cda299e9a20c929d5410178f757a8361ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1d6aff3e3304ceec670c0f19029771ff21279553d561158063436b26c18b3037
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1843216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c0bd00e346f678f48710ee02d750bd7d404c0882
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bc16bbf855b466e77dda996d8c91fa73db7fe14d3aa98ce6d92145ca1a1bd166
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1837076
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,12 +521,12 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6aaaf4f6db3f823d4d00dfce62d585dbd820820a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b7fb186f92aedb922c4e7f57ff276bbf90caf0087a2a980f704bad9ac44514fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9720996
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4dc542d972d862d20dd8f78768171aeb0f64162d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f0e8332c771958b4aa373ac643d35e2fabb1a2dcdbaca756ebf3d1ace7c631b8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9691816
</span> }
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:clang-6.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:clang-7.0"
</span> "qtbase qtdeclarative"
{"Qt Designer" "Qt Help" "Qt UI Tools"}
""
<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;'>- 576dfd1b011c134dacce809614ba762358537202
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 12d89b2afa64dce4d32c9e680135243c579d99aa9279d2aafc5602c15a697106
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1428808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c3cf68e0c158c779825f02d2185d76fa29f53f1d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cec1a83757e9c776f6c65020bf8963e9d2037963e5a93531e6274442128d034b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1418228
</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;'>- 1276f69108349783bfc6e4e8ba237e179816d1d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5b330dcc770976a2cfb8d85711d72a57c9764c1a9efb889c91e81f6071bbbf9b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10648700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d14cde39db1f514569b664dd2772de1d1d83a69f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2709500071e7e98ca6f6eecef0f5c80d19ae22aba562293352debd516633b197
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10690564
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,9 +566,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 56120b2e56218866f34eea7ff83071fd06c71087
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b9a476af15ae0c68a930f0b0aa8d988b8dc3e63c3d2134abebbf2148d6942e87
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 179700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 13a1560fb2dfb5301b299bef64f1365c329edd99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 945fdae8f1ea8dfc8e47a6d8421cef00690d6d4bfe26ce61bb59c0d0326c02fc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 173956
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,9 +581,9 @@ array set modules {
</span> }
qtwebengine {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 783d24997f0a802fc2763cf3f183672fad79e84a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 389d9f42ca393ac11ec8932ce9771766dec91a4c761ffb685cc429c2a760d48c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 233633572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 33dfae4bdfb000c105adf1751377d391dbfaffb8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3ff9bba5f631cfdd454ce298489360b3e2d9a2de4eb82bb121d838ef65f9b772
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 233642812
</span> }
"port:python27 port:py27-ply port:ninja"
""
<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;'>- 1c79a0b725d923646d236440b578e12f202e9e05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7d94c31ee172c49400f646e52b0d4cbd02b1764c46cd4babf6a119a947841e81
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 69652
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 742a89382b7305dc28f6f35395620f9198a0cb60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 16682ba6aeeef0420bcf3149be9792d0f82e734d6f9f730f66f7e1907dfa5f6d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 63904
</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;'>- 559b812279e0431a4252c49f46ede166d2583ca8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7aaa12f719e853a195a670ff51697b73914e37c94ed2216d53a2d9e0861748ae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 231468
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2b3431fbf4be7a1114ac594c6c11799a6eefabb9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ae6197619ce0c4104bdc43e097d79082f90ba6567fa286eae6306ce7aec88b8d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 225948
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -656,9 +656,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 933cbedb981723026a35196163d43b4d59d68e0a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 77c9bb78d3626789c31ef84056652daec1fbcad9e9ad6ad61e625d3e8232aaa1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 132948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f6387263ccf0f74aaef15548b9b2a76d7aee587e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 346267a9df2366cb9d022ce3385aceeffc552fe7dc311f4563023e2677b260e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 127124
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -671,9 +671,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2d6a7f8d40f435542c53949524a605b09b321adc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6117e120c87b32dd07877dd0a6bf862b6285cb0d8b547190882980682f53af58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1378340
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b27b63c6c79927b219d73a0a0226e91d9481da93
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5fd5f680ba40dadf81665417501e1f3778982aea0e268bf4f75a420d54a86746
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1372836
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1425,7 +1425,7 @@ foreach {module module_info} [array get modules] {
</span>
# qdoc now uses libclang for parsing C/C++ code
# see https://wiki.qt.io/New_Features_in_Qt_5.11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append LLVM_INSTALL_DIR=${prefix}/libexec/llvm-6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append LLVM_INSTALL_DIR=${prefix}/libexec/llvm-7.0
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1445,7 +1445,7 @@ 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://trac.macports.org/ticket/56829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://chromium.googlesource.com/chromium/src/+/cd7154e0bb5f3ca9c72586da79f87d13afb5361a%5E%21/
</span> patchfiles-append patch-qtwebengine_xcode10.diff
# the following libraries, even when available, do not seem to affect the build
<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 a8da4ed..d3aa12e 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;'>@@ -4,8 +4,8 @@
</span>
QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CC = clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE_CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CC = $${CROSS_COMPILE}clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXX = $${CROSS_COMPILE}clang++
</span> +QMAKE_CC = __MACPORTS_CC__
+QMAKE_CXX = __MACPORTS_CXX__
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,8 @@
</span> -QMAKE_MAC_SDK = macosx
+QMAKE_MAC_SDK = __MACPORTS_MAC_SDK__
<span style='display:block; white-space:pre;background:#ffe0e0;'>- device.sdk = macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- device.target = device
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_MAC_SDK_VERSION_TESTED_WITH = 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- mkspecs/macx-clang/qmake.conf.orig 2017-06-28 02:54:29.000000000 -0700
+++ mkspecs/macx-clang/qmake.conf 2017-08-27 07:13:38.000000000 -0700
@@ -2,9 +2,9 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-pc_files.diff b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dd49655..29d9b90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ diff --git i/qtbase/mkspecs/features/qt_module.prf w/qtbase/mkspecs/features/qt_
</span> index bb28af97..36bb6483 100644
--- mkspecs/features/qt_module.prf
+++ mkspecs/features/qt_module.prf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -265,7 +265,7 @@ load(qt_installs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -266,7 +266,7 @@ load(qt_installs)
</span> load(qt_targets)
# this builds on top of qt_common
<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><span style='display:block; white-space:pre;color:#808080;'>index 84adaaf..af376d2 100644
</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;'>+++ b/aqua/qt5/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,66 +1,94 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0fc07d2943753f444f3eeccd9fb1dfde0938cb70 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Alexandru Croitor <alexandru.croitor@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 16 Jul 2018 13:24:51 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/1] Fix Xcode version check to work with major versions >= 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=utf8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mac: support build with 10.14 SDK
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-We used lessThan for the Xcode version check, which started to fail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-when comparing Xcode 10 with Xcode 7.3, because lessThan first tries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to convert the arguments to ints and if that fails, it does string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-comparison instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Two changes are required:
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Rewrite the code to be similar to the SDK checks.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We can't use the qmake versionAtLeast function because it was added
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in Qt 5.10, and we still need to be able to build against Qt 5.9.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+1) Explicitly upcast the result of dispatch_get_global_queue() to a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dispatch_queue_t*, since it changed to return dispatch_queue_global_t*;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2) Add empty implementations of the new methods on ICCameraDeviceDelegate for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ImageCaptureDevice
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Task-number: QTBUG-69476
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: I831a683ee676838a4d531a4d6e715182e9e4193d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Michael Brüning <michael.bruning@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkspecs/features/platform.prf | 22 +++++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 21 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TBR=maxmorin@chromium.org
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 614f7fc92..c790c9fa6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/platform.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/platform.prf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@ defineTest(isPlatformSupported) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else:osx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lessThan(QMAKE_XCODE_VERSION, 7.3) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ !isMinXcodeVersion(7, 3) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,6 +126,26 @@ defineTest(isMinOSXSDKVersion) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug: 849689
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+Change-Id: I9448d1b07f8d4116ecdb0c75a7796472e51c6dd8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-on: https://chromium-review.googlesource.com/1087169
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Robert Sesek <rsesek@chromium.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Tommy Li <tommycli@chromium.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Cr-Commit-Position: refs/heads/master@{#565040}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index af289bd..831cb65 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/components/storage_monitor/image_capture_device.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/components/storage_monitor/image_capture_device.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,4 +231,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name));
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+defineTest(isMinXcodeVersion) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ requested_minor = $$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ requested_patch = $$3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isEmpty(requested_minor): requested_minor = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isEmpty(requested_patch): requested_patch = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_var = QMAKE_XCODE_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ major_version = $$section($$target_var, ., 0, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ minor_version = $$section($$target_var, ., 1, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ patch_version = $$section($$target_var, ., 2, 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isEmpty(minor_version): minor_version = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isEmpty(patch_version): patch_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// MacOS 10.14 SDK methods, not yet implemented (https://crbug.com/849689)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ didRenameItems:(NSArray<ICCameraItem*>*)items {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NOTIMPLEMENTED();
</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;'>++- (void)cameraDevice:(ICCameraDevice*)camera didRemoveItem:(ICCameraItem*)item {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NOTIMPLEMENTED();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ greaterThan(major_version, $$requested_major):return(true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ equals(major_version, $$requested_major):equals(minor_version, $$requested_minor):!lessThan(patch_version, $$requested_patch):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ didCompleteDeleteFilesWithError:(NSError*)error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NOTIMPLEMENTED();
</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;'>++- (void)cameraDeviceDidChangeCapability:(ICCameraDevice*)camera {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NOTIMPLEMENTED();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return(false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ didReceiveThumbnailForItem:(ICCameraItem*)item {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NOTIMPLEMENTED();
</span> +}
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- defineTest(isMinWinSDKVersion) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requested_major = $$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requested_minor = $$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.16.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ didReceiveMetadataForItem:(ICCameraItem*)item {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NOTIMPLEMENTED();
</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;'>++- (void)cameraDevice:(ICCameraDevice*)camera
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ didReceivePTPEvent:(NSData*)eventData {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NOTIMPLEMENTED();
</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;'>+ @end // ImageCaptureDevice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index 2ac812b..34d1ad2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/media/audio/mac/coreaudio_dispatch_override.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/media/audio/mac/coreaudio_dispatch_override.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* replacement;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* replacee;
</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;'>++using DispatchGetGlobalQueueFunc = dispatch_queue_t (*)(long id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned long flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // namespace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This method, and the tuple above, is defined in dyld_priv.h; see:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,8 +178,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const auto* header = reinterpret_cast<const mach_header*>(info.dli_fbase);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_pause_resume_queue =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dispatch_queue_create("org.chromium.CoreAudioPauseResumeQueue", nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dyld_interpose_tuple interposition(&GetGlobalQueueOverride,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- &dispatch_get_global_queue);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // The reinterpret_cast<> is needed because in the macOS 10.14 SDK, the return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // type of dispatch_get_global_queue changed to return a subtype of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // dispatch_queue_t* instead of dispatch_queue_t* itself, and T(*)(...) isn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // automatically converted to U(*)(...) even if U is a superclass of T.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dyld_interpose_tuple interposition(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ &GetGlobalQueueOverride,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ reinterpret_cast<DispatchGetGlobalQueueFunc>(&dispatch_get_global_queue));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dyld_dynamic_interpose(header, &interposition, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_dispatch_override_installed = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LogInitResult(RESULT_INITIALIZED);
</span></pre><pre style='margin:0'>
</pre>