<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/ae2650ecbb249d691d6420055846c7169c928a03">https://github.com/macports/macports-ports/commit/ae2650ecbb249d691d6420055846c7169c928a03</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ae2650ecbb2 qt5: update to 5.15.10
</span>ae2650ecbb2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ae2650ecbb249d691d6420055846c7169c928a03
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Tue Jun 6 14:40:36 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5: update to 5.15.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Drop upstreamed patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apply upstream security patch (backported from 5.15.14)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/qt5/Portfile | 222 ++++++++++++-------------
aqua/qt5/files/CVE-2023-33285-qtbase-5.15.diff | 68 ++++++++
aqua/qt5/files/patch-sdk-no-stderr.diff | 15 --
3 files changed, 178 insertions(+), 127 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 c2e7353f742..131a9739619 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;'>-set qt_version 5.15.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_version 5.15.10
</span> version ${qt_version}
set middle_name everywhere-opensource
set worksrcdir_middle_name everywhere
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,9 +188,9 @@ set llvm_version 16
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 83b23ed0a1031a8559f6f9e7a9c0bdeb2069e82b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7a7062acdd8cd149925c727bad9f18e41020a47551be4b39306cb3dc859154c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 118313120
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ba4234eef98e1994542cd3f599e1910d7b11df35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 225c06128b9b3574fd96d87890bd28c856198c157b91619e1e8ea8de41958c5f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 118262456
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,9 +203,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5693e1bc65204e0d96c592006e81b9d546104baf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1947deb9d98aaf46bf47e6659b3e1444ce6616974470523756c082041d396d1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 50389220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 77a3ff43ce3efcec532792ef1dac70ab0c681859
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c0d06cb18d20f10bf7ad53552099e097ec39362d30a5d6f104724f55fa1c8fb9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50422688
</span> }
""
"port:zlib port:libpng path:include/turbojpeg.h:libjpeg-turbo port:freetype path:bin/dbus-daemon:dbus path:lib/pkgconfig/glib-2.0.pc:glib2 path:lib/pkgconfig/icu-uc.pc:icu port:pcre2 path:lib/pkgconfig/harfbuzz.pc:harfbuzz port:double-conversion port:zstd"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,9 +218,9 @@ array set modules {
</span> }
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2a2cca7f2f42f4ea0e5a9e6baba03cb8d3e00fd1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2ee4df662ceeda868268dd890f0e89033a4d89e7f4188f4c1b03ce315c9af816
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4253692
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1b821f2de9031686484f7cdfaa338381cd3007ee
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d074be49e2ec9a1f87c979b3fd6510c81379a2d59556be96982bae1896c2a12b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4254496
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,9 +233,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e8d89b21d754a322eadd24b73ec8cfec8f74bcf9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 850f40ede3647baf3fad4ac262dac9a79dd5b2037fbb35f2731131dbfa46cb56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2824968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 029673e9659d8df6d65f9bd724fefb559df1517f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3fdb1c0315eadc7674d583aa3af6708609ac157a108fce4bc4283bd98ee1b9e9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2828256
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,9 +248,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 41576512a9f184482402c7f8779072cbfbc10b76
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ead6744e085736525e5fe3867e0fb095cdb91d06f92c7e524844d53cd7e2bb90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5193380
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0325fa65bc0f86c20132cfd028d4311ff27a67ca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e515605e599b4989399a350a085ce8c65a23ed9b9faf33836015550a01351ed2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5193796
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,9 +263,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fce4df235820ff2e3c85b9e19aee6ee200897918
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 124aa6e0513f8d4b33a1b351b8d0980be37522da68f7051d0db9adfcf07ba726
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21587820
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9e3ef1a14b266f4f5ad4f3b04a6e328bc806ceb1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 239b4c3c4cc49b174391445ad4b8320c11c8655300977955febd5dde69d33df4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21596352
</span> }
"port:python311"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,9 +278,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1a9f70cbd2c818e63f0adeb5f99de70aaac8eb99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a4db8d5635ae2e3e5797765752a14c5fd1a3a5f2009e8880bf51ebbd409f7a98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5750160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 82a70011d937167a0b44d1ba38d67d167ae98786
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6df8cc5b199e949de8a3efc59de2bb57607cf36d47279fda3daa4256b9595ddf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5751072
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,9 +293,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9ccf2a662f90af2d60f670617d1ab8a0f0cd0a09
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0d2ab4fb2db67711df2addf2fd47bd559696a78ccd4ac41951f8fed28b256a6b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 388984
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ba484f7ca99cd5788462fed9db9f0c49ad6f4134
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6808beb2d78a4346793043358afbfd46a064fce3fe11f79491347434c48a6a76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 389844
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -308,9 +308,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- db45bdd6bec21d9cc7455275a9b95b86e7e34947
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1c2b83c0996b73cfd750032ecd24d8d72b5e9b91f131341a3cb06d976e2b2a12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14043904
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 97764dbfafaba2f3e068414bfa2be9aa815c44f0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ab2cb196b2f4da5a415daa364691c474700c07bbaabae6282da990c31e7dc005
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14045288
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,9 +323,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d683bb2c1500a535ab8c57b450a004b563c2b974
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2435f9c4ef4a03292f0a911c8da14ef6ad38775b6f97722f4a8863e1aae61ba3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1844504
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 46a0904fd3601294dea5fa75615c6474906c12eb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4f248a48c467d684cecedf36c6fd7d1f0edb47748fd7854c24a178b41154d1b2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1845088
</span> }
""
"port:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -338,9 +338,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8f985baa1da4bb630aea801b7fb5e7e76a7bcf45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2d08ef5ee952e0bbcdd74c6664e6f6115c35a31f8299b3d5356375433e887586
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6552244
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7f357c52a1f05df8009e21f084e2ad086ef1f9d5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8816d26b947fc2b9ddb936acba3135ccb7517b4f9567d8a59916f3fc80bb6c33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6552240
</span> }
""
"path:lib/pkgconfig/icu-uc.pc:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,9 +353,9 @@ array set modules {
</span> }
qtlottie {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 54193fd18266dd3c17de95db9038af41fbe27703
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0e679af1d127cbac8f7ffaea1807ae7aefde14831dae317ad1b29d35a19db826
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 84432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 88b2e21efb8513d0a9b8b2cc487e3e7cb673913c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1fd3ab2a54223be60a57498fa0f213fb7dd4829f918928cc7d3f328ff34ad5a5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 85380
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -368,9 +368,9 @@ array set modules {
</span> }
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5a4eb13aaade3f91317863f52b7ef449017c156b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 951eb75c113d36dc4ce08b600dbedf84e6e5858286876e88f4499afed0ccd394
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 71588
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e1a944495b659b694b35201f4fdbf086dc00ea2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0c839ff69c3b9e73c9ff134b3b2bd2ec302127272e47cd67411524a388200e92
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 72444
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,9 +383,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1590ed30db8f8267f8f3ccbc609ab6d6cc4f12a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 453e30affb938ea0427b82509c955cbe2d0846ef27e58aa3a53a99c27cf7c772
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3831184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 422fa1ce45f438ef162537b29894492488c600eb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1106e0bd8ec65b2c0a89170e452ea104ca9431050f507da5e874be2cb54f29b6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3832156
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -398,9 +398,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 25a9ee072b11acbfacd0e96bfa0c69612f88aba6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 088ab0ecc8958ebbc21b44dc152515d79159e0603948a574d8097fb444a75984
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 143792
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1b681dd9f3a48522d29ec4249d535303c0eb4398
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 91462651054a078e98b87cff510b56bc636fd0fa209843dd887ed17c206ec961
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 144780
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -413,9 +413,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7eff8a24b90407253f9859d55627dc188844bdad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e7f45fa86f50a5c017c9091f909f29caec25bfe55a5bf9cc5c7a4f5adcbbb889
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 308856
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 83371bc2914f6029e45d281c0380b96c713940d4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8b297f0f0a235c36e9e833648901e84a6da88b5c0d0644406ab6909e32fbfd3f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 309732
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -428,9 +428,9 @@ array set modules {
</span> }
qtquick3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a017b90556821e2f070ed7a80e80034f4ad639b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 422197661ccd36c4934ffc43116d2d4b249f223a804aa8e0caa934799e08120f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 55771472
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c6e86a2b7b8b3be8f70372387690699a442ad73f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6db37612f9a37d0fa6e8af302411f058b1fdd73c8bc9be1ba18b7f765f81d893
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55756692
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,9 +443,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e2e9781a51104e5c5ef36307a96d7fae70051412
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 958c46e54c400f2a5e8ce04d917d302ad39181d389079b6671213b233c560b1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5983564
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2774ac937385f65ff2878cb620574536c0f68aa4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a06a6e73109857f0fce7e4d6a75fbe6b8ce4e27bc4f99802a6948a86daa9efeb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5984520
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -458,9 +458,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 40f9b5251edc30ec6753e19562a68842eee68225
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- be2c54c5b85d921567918bd17e783f0ba10328c7eac01439fbf26192cb878882
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8291756
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21256c02131198f636cb0534397ef260d48cce96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 97954c92fee9031ec31341812ccf53afb3c132e2b271bcef1174367fa002fc8e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8293436
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -473,9 +473,9 @@ array set modules {
</span> }
qtquicktimeline {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eb7e938a49bc17406e415b6a8a549b518ad92d96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b01ded88b511787bb229347820e1c82989b40441705fb25680648be888e8d671
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 104724
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f718ea57e6c9f92ce26829ac397a2b89f089f7e3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a0effcbf39c68591e5b788edb96ba3f1315df0eb6bd6f0c6b43594b32b640011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 105584
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -488,9 +488,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5742d4b339a7b4b80f3017eb6e1c452c5e0b5643
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dadbc8cea632471db8ed52864b1047d2bc756c828a4690c23b40b3eebf415753
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 378908
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ca2a270ee9d3c2468455f2b2805839126d4b2dfb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 36fa891c1d9299cb13b422ac5626291db30f799f481ec50a493392d4618ce9c2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 379348
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -503,9 +503,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 58e029f4e84e9a3cce3c019244a50327d04a03d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 486fbb453a5e011a3d2245b3475c1e960bb0a29c7a1f8041a778c80097b0376c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2666040
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 16bdfc929adde38d8f160419638224dc767a4b1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 642dcd4506dd4ff19de6f671c3687ad5cce682a1ddc55dd7e9cfb840ac96703b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2666052
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -518,9 +518,9 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a22b83b8d251edbf0f352078666b59ac755f5ce1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b15e74e37366d8d08e2ae649b992ded7dee2952b3b8e5a418d2a57f6c0d8d043
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 436620
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2bc200f3641aa566b0b3984cbe67a0b1004f2bc8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f1ffc78b1fd25bc813c79992e22590099f8cc65ce4360c1bdd22f7d97adb9d82
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 437404
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -533,9 +533,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 159edf3501c37e17f10bc634a37adeea9519ade5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7f8790b40302b8178c404a9a23a43724871996882ff249d08642651f6ac6018c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2058448
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7785497633063ea756f188ab42911e859b6976d5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd3c2ac4d6097f506f7864718b8823dbb0cd0b34fac4a6ca8a23bac8fa59ff01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2059812
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -548,9 +548,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6c599763cc88df5296cb04c0106f1b3842ff5ed0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e9124618e18e07ba9ea83f21532ff0e8c2c02e6d6966621d001fcc9febcb93a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 358380
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ db3e9338e601e3d585a62602c9182cebf704cdfd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c9c13a71de5bf3be1a18b91218686f9aa08a7f429a526cb2067ea54b6d61ffc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 359256
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -563,9 +563,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 84198763f84ec07d6b806109c917729bc600c4d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 67d20803f08b33973d7eded2e5c75083704e43b005d4c3bc9c6e8a91755bc025
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 323496
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4033caad38ff2bddcf4bbd385b29e83d5a42ae0c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fc6f4e2a4585dd24898c3a823ab82f05f7337c0e0fd710bbde7745bc80f068fe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 324256
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -578,9 +578,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8edba708017559d073d875e4eedecaf8c2acb54b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4f9f7db0e919f782863c73ea872283ca905d6464221b9b789bfa0f4460e92a90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 104024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4452e4c18a57e1713537ac3c2db9be77b52c8f7e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8af34b46ae8a81749e455acd3e3602ae53983b01df76138172dba76a3bb64ce3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 104944
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -593,9 +593,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2b0cebbbf6dd605fc4e8e13a6f46a7ac6c605043
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 881f75d3c4a29a4ef88202763115c19d4869af2638227e9c3474e422639abb5a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1889044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8f7adebf09542cd6c9165c3bb0b0daae6e690312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cf13e3835b8a767779d041e556b0942c2d5aeb3b5a5d325ae5d2028c37004ae8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1889960
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -608,9 +608,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4777108f39a18a7151ba51174a80c9caec900471
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 40dce7845bc156dce7878b304e05b19f1ce7dedd4221c67af3bdf0138196006d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8898188
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c8961544c2d76dd6142b7968fd4a5f4693901ce4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 66f46c9729c831dce431778a9c561cca32daceaede1c7e58568d7a5898167dae
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8899372
</span> }
""
"port:clang-${llvm_version}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -623,9 +623,9 @@ array set modules {
</span> }
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e5a433bee81dcee1fdc2ea8ae8a0ef15e8345f43
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 35f4c4496e8a1f0605b3fb2e28c4b08e191796c9c03c32175a608e9c4dc4bb60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1635128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 74c10465a1037406fc18500e7d5fbae9cb8c093c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 38b942bc7e62794dd072945c8a92bb9dfffed24070aea300327a3bb42f855609
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1635736
</span> }
""
"port:qt5-qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -638,9 +638,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0e54d15e99e793def3469e833c1449521932ca6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5b31a91ea95562fa5d5ceb08b22b06adfcb20a2b90385f905a71dddb9dc88bf0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10962880
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9d03f170ba2cd8dcbd7c8da4d19436956da7f851
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4571faa716c36a3db0211379881d70c2ef510f7649289d434633e03ac3b43da8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10958048
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -653,9 +653,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2d5c5e8f1ee1cc2c2562abb95ebd320b280a3d96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 594a350bd92665df33a5839cf66ac1e43911e7653f4fc796b4a30aa85b428789
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 211032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fe78508267059b73705350133fbcc471d4e3d5c4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e25702f842057063075e7dd8460b3143b6c6666ba76d274f69bb039c2f8effe5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 211876
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -679,9 +679,9 @@ array set modules {
</span> }
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9f33d1f1197e62f6fdf1d8ac514908b0b50c508a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ebdfce37cad0b923784ba373efa39d827ea73ffb5fd57400b6264ffde98f8815
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 76264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c6d47766f7056ddac01f0e56e1db3d53a46ab60f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 19a9b6007dc74c3eda9304a4b94e6cdafb31677b835c6073dff1e6e20bde6c8a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 77096
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -724,9 +724,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 160b1a4f4c59cbaff29b5e1aaf18c54a0fb9fecf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 059bf13cdec01f7f8aa082bb9c40a72afde2d12d6bbfc703f4f723b768558e46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 260972
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 77cbe8127395b4cead65053639253abbc7025c97
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2b9562db9e5c4b4585ab017f9b46b59ddc75b4d7222c5b03ebbc479652f6d98a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 261792
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -739,9 +739,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 51278faf4c31f7e1caf17f2bcf4bf67e8b54330d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1f2128f97a6092aa8aa79ff9c49de5f0dd885f1cd918ad1f6db20db0041dbbea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 135696
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cf707aff1b2ba2b98b241c451e11b544becfc235
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2458c606dd9caa6e92b2fb136cc0f74ebb0757c1616a4c5180b2857d42328400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 136584
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -754,9 +754,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5e492b48afd0d0f9d337141dc07e00213f22742d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bb674703ba72d304698991d9d8dc20eace2bd4d8e0b5704b042cc19d873960e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5190900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0c29c63c381a4a5b41c8afc3fb6faf8d885ec3ae
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 03577573a2bbc035192a75917ceceadfd787899c3622d91e6a8844ad29d1da0d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5195076
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1078,6 +1078,7 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append {*}{
CVE-2023-32762-qtbase-5.15.diff
CVE-2023-32763-qtbase-5.15.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2023-33285-qtbase-5.15.diff
</span> }
# Neither "pkg-config --cflags Qt5Core" nor "pkg-config --cflags-only-I Qt5Core" will allow
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1091,9 +1092,6 @@ foreach {module module_info} [array get modules] {
</span> # this patch is specific to version 5.15
patchfiles-append patch-qt515-highsierra1.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/63805#comment:13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-sdk-no-stderr.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # find the Rez program
patchfiles-append patch-find_rez.diff
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/CVE-2023-33285-qtbase-5.15.diff b/aqua/qt5/files/CVE-2023-33285-qtbase-5.15.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ecfd3b3015
</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/CVE-2023-33285-qtbase-5.15.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,68 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/network/kernel/qdnslookup_unix.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/network/kernel/qdnslookup_unix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -227,7 +227,6 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // responseLength in case of error, we still can extract the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // exact error code from the response.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADER *header = (HEADER*)response;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const int answerCount = ntohs(header->ancount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (header->rcode) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case NOERROR:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,18 +259,31 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</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;'>+- // Skip the query host, type (2 bytes) and class (2 bytes).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char host[PACKETSZ], answer[PACKETSZ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char *p = response + sizeof(HEADER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int status = local_dn_expand(response, response + responseLength, p, host, sizeof(host));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (status < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ntohs(header->qdcount) == 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Skip the query host, type (2 bytes) and class (2 bytes).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status = local_dn_expand(response, response + responseLength, p, host, sizeof(host));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (status < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ reply->error = QDnsLookup::InvalidReplyError;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ reply->errorString = tr("Could not expand domain name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((p - response) + status + 4 >= responseLength)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ header->qdcount = 0xffff; // invalid reply below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p += status + 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ntohs(header->qdcount) > 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reply->error = QDnsLookup::InvalidReplyError;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- reply->errorString = tr("Could not expand domain name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ reply->errorString = tr("Invalid reply received");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p += status + 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Extract results.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const int answerCount = ntohs(header->ancount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int answerIndex = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ((p < response + responseLength) && (answerIndex < answerCount)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = local_dn_expand(response, response + responseLength, p, host, sizeof(host));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -283,6 +295,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString name = QUrl::fromAce(host);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p += status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((p - response) + 10 > responseLength) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // probably just a truncated reply, return what we have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const quint16 type = (p[0] << 8) | p[1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p += 2; // RR type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p += 2; // RR class
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,6 +307,8 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p += 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const quint16 size = (p[0] << 8) | p[1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p += 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((p - response) + size > responseLength)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return; // truncated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (type == QDnsLookup::A) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (size != 4) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-sdk-no-stderr.diff b/aqua/qt5/files/patch-sdk-no-stderr.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aa73688a716..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-sdk-no-stderr.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;'>-Intentionally ignore stderr (including any benign errors from xcodebuild)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-so that it is not treated as part of the SDK version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Accepted (https://bugreports.qt.io/browse/QTBUG-102066)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mkspecs/features/mac/sdk.mk.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mkspecs/features/mac/sdk.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We don't want to complain about out of date SDK unless the target needs to be remade.
</span></pre><pre style='margin:0'>
</pre>