<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/694a0b5d6a40440ec11e2c1605efd6821045f969">https://github.com/macports/macports-ports/commit/694a0b5d6a40440ec11e2c1605efd6821045f969</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 694a0b5d6a4 qt5: update to 5.15.5
</span>694a0b5d6a4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 694a0b5d6a40440ec11e2c1605efd6821045f969
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat Jun 18 04:31:13 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5: update to 5.15.5
</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 | 229 ++++++++++++++++---------------
aqua/qt5/files/patch-cve-2021-38593.diff | 23 ++++
2 files changed, 141 insertions(+), 111 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 663827c733d..01c8b3a3baa 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.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_version 5.15.5
</span> version ${qt_version}
set middle_name everywhere-opensource
set worksrcdir_middle_name everywhere
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,9 +196,9 @@ set llvm_version 14
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fb00beccbf0ebc3854a742968585344f68ad4954
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 34b5f20c945c867774fcf38e1ddc519b3e06e14063ef84edcfa9f3e80c9bb4cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 81930768
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fec16bf7abf90c51804e642f0173e47e6cc9a2a2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 404cacc8c33c1b6d796c691569915e5758addf63bdc6c9ddc3c066864a3b7ed4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81935728
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,9 +211,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fb8b0113307c7de8e04d9dbac9c51be0d7c9627d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 26394ec9375d52c1592bd7b689b1619c6b8dbe9b6f91fdd5c355589787f3a0b6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 50204364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9eab2837e3296daed8f8551d29dfbf9fb33211df
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0c42c799aa7c89e479a07c451bf5a301e291266ba789e81afc18f95049524edc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50247388
</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 port:icu port:pcre2 path:lib/pkgconfig/harfbuzz.pc:harfbuzz port:double-conversion port:zstd"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,14 +221,14 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0dc7aead677fc4728a87cfcdc80f314808d2f4cf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- accf85cda64641d42f4cba098741c8b9df38f7de606a38c8663d754bb61623af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4252036
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6f041117f513926b7f3d61c4c539d9897cc29152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 119355be6810546ebe525cf57b485c55f2325167a732e4e6f26e9d81420c0578
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4254052
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,9 +241,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7c7a8d5eee3e85c763081836f6e28b2a7369bd14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f17fda1dac3248be2800af05ac0e2493920e63b61732050aed199bfd41f265c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2815220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2e9f08f4635319e4fa7044249a0daa4c5f136d35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 27153d8e037bab415543a824d12b282e25ca192241db07b30e77c91c78b74d2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2817040
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,9 +256,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 23b53d9260d938ad27f4e04f9aa6f83a0f537165
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d7123fb7239d6512240efcd31ad5e288420be858bc8322f86fc70be16e46aad8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5191636
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0ca805b8b76f972e55a61e59fa2a40c5b60ff821
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fd9c977db21fc748e518cc6a172eb2eee46a2a04bfe3751cf74d9ac128e69f69
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5193068
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,9 +271,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b5191986a35b90d5459222ea9a9ab4d47388c870
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 33f15a5caa451bddf8298466442ccf7ca65e4cf90453928ddbb95216c4374062
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21567896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c29e36b8d72bdf4987cef5b1e6e4511909fa9e59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5cc169d91efb15a1ee7f484862f872c3eaba592dacf3c0fbcb55c0f3c208254a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21581628
</span> }
"port:python27"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,9 +286,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- da226aa905550e8e463fd32a069bae992c7df3f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2ef04bade2ea964a59f7326ffd08d863fdcfeaea94b104ebf2dae33a1e791043
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5746620
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1f45ea8394589b73d9e44b9f4115ef176ad62a07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 52320282eff19556f0ab2434a139091a4e401bb83e2d6ef5aaf0868643277cdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5747564
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -301,9 +301,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9f75cff351647edd0bfd943ed016d5ef1c5d2d26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debdbff30f9bc9d2e65ab3b8dede9a2a0688ecffda394b30d481f32911fd0c3f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 387112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81c35956dd36e1c716a31ca05001bcf98a1d678f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6095dfe2903adbc46f432ff2b9cc933c55a8182fbefd5617b91416011c6a4471
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 388708
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -316,9 +316,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2cea5c953eeae009e39cfb8f5db5e3fec846e84d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e24e855f202bb24b4f8ea9df504e24f451a5af49875a18cf324faf5f1e628f6b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14040888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 16f0e0ae7a0f1320f1cbd949323281a38564adc9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 237fd5ead50866128a7ae3820f454d0e6b955e648892429fc3b99b8b7fb1f677
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14043788
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,9 +331,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 55118d09183680022687188b9f34107a87d58780
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 747619890cf129d1d98a6e3d157e689c6c2a723e724a41d738012a542a54e222
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1811496
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c1f74868be94562b74015449004744f000b259bd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4aa058e123b96c2c17cd9cf11cabbd5471b9db950d61ced23f5caa00c5174bf6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1829872
</span> }
""
"path:lib/pkgconfig/jasper.pc:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -346,9 +346,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 00da8ebf012a0da3e727ebb64e1e425b92f9be5e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a69f28ccfd4ef8e69e0131b178d41d71264be836f2f55bd29731e908a22c6bbd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6556680
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4731b89c6e65948d76669285a1339713d496f834
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 629d1ba923d39e765c5a1ce420a460a048d6257586110067caf78dde19849056
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6559912
</span> }
""
"port:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -361,9 +361,9 @@ array set modules {
</span> }
qtlottie {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 538124cbaee2d9e3dae80004996b2494b44f9324
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dae5a5e650c831a36b342b43863677673ec37fa7dc2f4acc51b4d30ca1cc1490
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 82432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 91b53b7c9a0dae31e7ecb093a687a020fd228d81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ efac34bbde99922b639e55fdd3b9e8b272676138302025835fe4a3a301d6800b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84116
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -376,9 +376,9 @@ array set modules {
</span> }
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7db90267f79ba6e59ff4a7ca02e8b53493423088
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9b4d040c7b36c0aa8e3c58f7384fc12ceb2bf7fe2ff6a365dc87c3f1528ad887
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 69492
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5e4e96c640f000e73d92516ad4c71108088b4bb5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fe318265345819e16f7924925f9daca2ca6a9a8c3f1eb518bce4376528bbaa2a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 71220
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,9 +391,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 77aeba6f54646487dd04bec9a14b3a4576c66ca8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2ebaa33720b808aa074fd15b9de506c1e89b670b39c7d4b62cb859e70ce606f0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3828384
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4dffa3881a8f96282e8f10fd875332b02cda5de4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bc9ff46c687570b2efa3f31b9b8225c0da672e81f484166b41f5b1ec828fe660
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3832656
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,9 +406,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 16332786177cf6e1b2068d16806a4b7e463460e7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fb9e6da60251dd04147006ad747f0d046f20677023f978c42cc7776150bee522
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 141748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eb3fae196faf5c6e9b16554fdd4f32eca5263fe9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c10959a40ea74423630cacaa6be1acca535dbf56401bfd3003efd25cc2f9f530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 143584
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -421,9 +421,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ced44a6d7e84213e3bc622c536e3607f8ade6de0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0bfa41370c5fa22410625181bf4443c1534414e329ef48c9ee54c2c4e19ac2f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 208772
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dfc808a3128032e9d4d6d192334f6d5ff91a679c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a7373769cb55f1010d3fd7b23a496ff6391b5bdcf11dfda029ef8d633fafe613
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 210480
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -436,9 +436,9 @@ array set modules {
</span> }
qtquick3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 443f705a0b25c8940cd2415f3111b951018eca8c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 236a5645957d28b9980410bf7c3875f8de19d54a8f3916af6d5685fe3a08cead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 55738508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f4b28cd8b96c2352d6dac189eaafa86ec3118232
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0014cb005baff95dcd1f7343d68812418df4efc039c1793b3dd0479646a19c10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55762892
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,9 +451,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fdb0d989caf346bf583f6f057789b745fdb212ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4034afce2e8afde4c4cb5e3be3ce240d00647fa0d292f4cd1ac4454ce40230f0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5982868
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 35f5b4c841953b86577205c860611ff5e6e8b202
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 596b181b6ebe4aa2f90e9de512cc306c08b29a9798e49cbedc4bb4c778115c56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5985492
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -466,9 +466,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 3155b3c471de2474656458699f7a7bee54c7d6d2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3b95e9be58c3d918f4c4a805116459a403ae6c61e33edf71b319672c46af562f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8286960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 507f5d26bf747cc5249ee7a362ce9da564dd1d13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c4a37bace5a0f6a9ec997097a5e331b438f4b5019d925aa2673fcc036825afb3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8290736
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -481,9 +481,9 @@ array set modules {
</span> }
qtquicktimeline {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 27b9281262684a72239368a22ae9251836ccec07
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9f2286314aeeccb7a095167e114c6e64593c9c748608149b7363f0034249e2cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 102668
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 18a87d4ccf8d0f2fadb1b51e2ca8c2e6e98e351a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 44ced9a3a75f18dfd2b04923a38011d809bdfcc754f3a656bcc4bd59d413b1c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 104344
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -496,9 +496,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 956b32f6d65edd267065d8f2968158ad10e60eda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5e34ded55199659afc3c7746cedb536ef8bde384aac7b20a0936192e466b123c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 374700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7fb837831328c59267ed498233b374c73e62bdab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7a4e1049883d184532d821f159a56aa15012070c364a451a03d6e9be28661dd4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 377896
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -511,9 +511,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dfabcde80632c31f9c798807f2af535539b446b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f0043815d74f7103fdb4520bf1be2060a4e21c1e0cde7dfa30760750cd40343c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2663512
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e3c47ac60690d3ac1104c442e647290ffa18393a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f522b6d4d5aba0ffa7ae716a6b333fe459e6695627304aafa3fd90c8d005d39f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2665268
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -526,9 +526,9 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4463922afe615f6e892c2bdc6a994fa904e8ec2f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5d03d4b90ef9266c97771b3c254ea01103b169ccb1b329a349beb90da0747c4e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 434432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 94a7577f9d1d0e476a43e09700c427ae4074a4a9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 17debc4fbe7bc3d98624b43d47e22a0a8b871173af7afa6447d0049e35aec575
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 436640
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -541,9 +541,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 25ebd23b437d1d33016f147596e0b5a0637864d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4acbbb07fb1d782e1f6b092563ff227134ebb2746b6b5027aede28e3a117a59f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2057388
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9ad9dc861d3e4cd7d31f9e49da2df4a08ea5dbfc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6d681d6a26ee1fcf6dbedc211015f10fcc481c3f88e721d68ad10aa025a9907e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2058852
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -556,9 +556,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6209b39b4fbd9a90c44579100c49ac41d243b2b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f8bfe4a7a7f685a123c76e8f9825e8f58677b4ba47b8c1eefc35db707ff89de5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 356520
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ da950705d1afad7c76997140a51c47f1bf054b29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 321dc9bdd146e6a525c545290e2f004e8dc6436b4efd50c480c03abc65a80fa0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 358296
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -571,9 +571,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 47b0948037347311311fb75221f6efed6bafcc17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a12974e758d58508776ea8371610808cb047375d515301aec80c1307d4dbae32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 321572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 40a6ec449865245d02a018ad5416ec11c73061f2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 549d096a9fd20c5d48bd014201afb88b570bce2be752aeaac2b2c80cb96ce275
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 323168
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -586,9 +586,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 74252cd3f3ab8f2cb6f1d8c8e6c184071f7fe658
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 58a7cd3fcb5216f11684c7d87ba7571673297370ebe74cbffc2e211e534b852b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 101852
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1a646dafc2224b52ac7d063de679b8d399ce5e80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a45e5960738fff11b79876605dbaf58ffae8e5e60fcde7bfc6b678f95bba5377
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 103640
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -601,9 +601,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- feb0a2041e3b0d1ed343891a680a2e2788d3afb2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3adc41dfcc67bbe3b8ff553bdac30ee75e270745536a58e54cdb741fa0505d89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1886104
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ da9c96dc4f3c3105f7093bc8f0c76f83d1f0fc1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c4cf9e640ad43f157c6b14ee7624047f5945288991ad5de83c9eec673bacb031
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1888600
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -616,9 +616,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8939bd3b6f0ce3fe7b98d949fd6d84454a3058b1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 463b2fe71a085e7ab4e39333ae360ab0ec857b966d7a08f752c427e5df55f90d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8896764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 879b6b1ffb0a4e5e8a4541f5f1187c18f53a5674
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6d0778b71b2742cb527561791d1d3d255366163d54a10f78c683a398f09ffc6c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8898140
</span> }
""
"port:clang-${llvm_version}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -626,14 +626,14 @@ array set modules {
</span> {"Qt Designer" "Qt Help" "Qt UI Tools"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 377549f291661b363e94c9da2151a7e0f8f0bb76
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5d7869f670a135ad0986e266813b9dd5bbae2b09577338f9cdf8904d4af52db0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1617284
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e1c604e56c693900068ba009b9ba508f1817d28f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c92af4171397a0ed272330b4fa0669790fcac8d050b07c8b8cc565ebeba6735e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1618860
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -646,9 +646,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dced5aa54d678d81ef9d22930598d93b9d6988c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7a77f897d8be87c05921caaf17b9e63e6f50e471de3276750d70f6fe22d06382
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10959776
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 70ecd8af5742b956be3b9f72aed022d86adc0689
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d96cf8203b136a438c7d75b14bde70db660a791f3ac3bf6f4d0bfa6831bf0ab6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10957016
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -661,9 +661,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ebd3cf86dd70c30911c375aae81cd2060d806065
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2fa019ebd2fa6805ca3011540ffa7d294727316191794a1612b00129845302eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 209116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 49171fc9dd1b35a44ecf1afeb68080b6522718f3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4ed231aba0a50b222040166ca7329f5648ca2345013b6fd4780f5e8adb6515f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 210712
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -687,9 +687,9 @@ array set modules {
</span> }
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7abccee84798bc68c4fb29f4a1b66a4bf73eda4b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fc6751b408cbb861b292c1da1ff20f38b1be4a55e154a5046d49bcf4308d3820
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 74160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 37e6811eb4dd1710684d44bae23127aed639d538
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2e592b1201bc384308077298d5d708cf22470637db6371e3a207f0e9b52617d4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75840
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -732,9 +732,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8f0e924c60b23a8e4336f55b2ca5f9022fdcc44e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 97c9f6c537da79a2627dc1d1609e01182aaaa79e166c40be77cab27daed853d1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 259184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 24b940567691267d093839042acf7c88f0699bf4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 66ab8b5bb2e64392fe43786ca1c2fd4be3306fbc4b969aa1748e568b5d062238
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 260676
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -747,9 +747,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dabf2dc1f61edfe7727aaf493a930677ca4537c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 187ab063897255e792f9ef0de23205b1a1a7d439a6bb4702a2e17909a810d31d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 133700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e8cacfee8b289d2ec013c00125463cde3ee3114a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5439a6fe0a4a4350ec3ddaaac6ec0cebb718db99c7a146fea0b87839fc543c2b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 135256
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -762,9 +762,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b16a14fe8432f555877e143657c0a6ddd0d3130b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 603398f3f9900b401a271231eebc68079d6c5844e968088832f9ee2819cc7fad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5211100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 86c0399a211ca82a7f27a1c05a81c5458dc82123
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0557b711207c4fa5cef1c288aef506fd127dd3f27a5e9d1c788cc4325f90bb18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5210040
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1071,6 +1071,9 @@ foreach {module module_info} [array get modules] {
</span> # https://github.com/qt/qtbase/commit/dece6f5840463ae2ddf927d65eb1b3680e34a547
patchfiles-append patch-qiosurfacegraphicsbuffer.h.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Backport from 5.15.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-cve-2021-38593.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace \
"s|__MACPORTS_Rez__|[exec -ignorestderr xcrun --find Rez]|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1814,6 +1817,10 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtmultimedia" } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avfmediaplayerserviceplugin.h:55: Error: Undefined interface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build-append ${subport}
</span>
# In the file config.tests/openal/openal.pro, defining HEADER_OPENAL_PREFIX means
# include directives use macOS OpenAL Framework.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-cve-2021-38593.diff b/aqua/qt5/files/patch-cve-2021-38593.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8a4cb2fd65c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-cve-2021-38593.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://invent.kde.org/qt/qt/qtbase/-/compare/081d835c040a...427df34efdcb?from_project_id=1216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/painting/qpaintengineex.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/painting/qpaintengineex.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -415,15 +415,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Check to avoid generating unwieldy amount of dashes that will not be visible anyway
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QRectF extentRect = cpRect & clipRect;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qreal pw = pen.widthF() ? pen.widthF() : 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qreal extent = qMax(extentRect.width(), extentRect.height());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qreal patternLength = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QVector<qreal> pattern = pen.dashPattern();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int patternSize = qMin(pattern.size(), 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < patternSize; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patternLength += qMax(pattern.at(i), qreal(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (pen.widthF())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- patternLength *= pen.widthF();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ patternLength *= pw;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (qFuzzyIsNull(patternLength)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pen.setStyle(Qt::NoPen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (extent / patternLength > 10000) {
</span></pre><pre style='margin:0'>
</pre>