<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d082fabb28f6879ce43bf37ddf2f20701a5b616e">https://github.com/macports/macports-ports/commit/d082fabb28f6879ce43bf37ddf2f20701a5b616e</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 d082fabb28f qt5: update to 5.15.6
</span>d082fabb28f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d082fabb28f6879ce43bf37ddf2f20701a5b616e
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Thu Sep 8 20:02:56 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5: update to 5.15.6
</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 | 227 +++++++++++++++----------------
aqua/qt5/files/patch-cve-2021-38593.diff | 23 ----
2 files changed, 112 insertions(+), 138 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 8aa2a562e5d..a688998106b 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.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_version 5.15.6
</span> version ${qt_version}
set middle_name everywhere-opensource
set worksrcdir_middle_name everywhere
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,9 +193,9 @@ set llvm_version 14
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fec16bf7abf90c51804e642f0173e47e6cc9a2a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 404cacc8c33c1b6d796c691569915e5758addf63bdc6c9ddc3c066864a3b7ed4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 81935728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 45134b0c746023e126c3c9788309ea9748a154da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0415844bdff6505b549c624961ab475543abf0a02d39230a34be61a02922bce5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81928680
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,9 +208,9 @@ array set modules {
</span> }
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9eab2837e3296daed8f8551d29dfbf9fb33211df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0c42c799aa7c89e479a07c451bf5a301e291266ba789e81afc18f95049524edc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 50247388
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2ed76cba24f23f04e45b3a8319ddae25d1ca0684
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 396bc6b0d773ac6a7c691a4c3d901999f571e3e7033d7fd6f65e4ef2b6eb7340
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50240276
</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,14 +218,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;'>- 6f041117f513926b7f3d61c4c539d9897cc29152
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 119355be6810546ebe525cf57b485c55f2325167a732e4e6f26e9d81420c0578
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4254052
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bc3d2a97f1c23ddfc6b09cc6ce8cacaa665ca07f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fdf8345b939c5dc39254b1bfb69d778e0563c23a3d0112d9509f9ceeae6cfa1d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4254060
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,9 +238,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2e9f08f4635319e4fa7044249a0daa4c5f136d35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 27153d8e037bab415543a824d12b282e25ca192241db07b30e77c91c78b74d2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2817040
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0e0fcb001ce6efff1358f56d3538e3a45fb47fb9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c1c59a6593be9f56fde3285bc3dae4419946a28c5222d1ccf70ee11efecf40d6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2817924
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,9 +253,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0ca805b8b76f972e55a61e59fa2a40c5b60ff821
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd9c977db21fc748e518cc6a172eb2eee46a2a04bfe3751cf74d9ac128e69f69
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5193068
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f741b519e224dec3c6aa1c7301852b6be3a5735c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ccf4f8d933eec577109fdff7f7ed4fcc895f808440c7d21f278f4bce3db04c3e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5193396
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,9 +268,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c29e36b8d72bdf4987cef5b1e6e4511909fa9e59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5cc169d91efb15a1ee7f484862f872c3eaba592dacf3c0fbcb55c0f3c208254a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21581628
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dd993223b769fe0e9861e695b0866da6c4834a86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6800b2b79535cffeac4cfa4545d68f4e2ca6b606db8b10219350e9a0c7c6b61d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21587108
</span> }
"port:python27"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -283,9 +283,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1f45ea8394589b73d9e44b9f4115ef176ad62a07
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 52320282eff19556f0ab2434a139091a4e401bb83e2d6ef5aaf0868643277cdf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5747564
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f1abe8af1b20562335d96a8fa903b83e00552b86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a1986b8d216ad881fa678563df0abb1d6a1c74634e6b7167a6dfe1363a88ef2d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5766140
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -298,9 +298,9 @@ array set modules {
</span> }
qtgamepad {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 81c35956dd36e1c716a31ca05001bcf98a1d678f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6095dfe2903adbc46f432ff2b9cc933c55a8182fbefd5617b91416011c6a4471
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 388708
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 95c2a255be2299b650230ab2794bd3c756e55f90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8d904f3d5d4af917473f550d5ae275d293a037f7fc4e12ff8de7828c1184cfa9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 388756
</span> }
""
"port:libsdl2"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,9 +313,9 @@ array set modules {
</span> }
qtgraphicaleffects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 16f0e0ae7a0f1320f1cbd949323281a38564adc9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 237fd5ead50866128a7ae3820f454d0e6b955e648892429fc3b99b8b7fb1f677
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14043788
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b6932c887d889b8a835e1aeef34ee0ae3936119e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dad9a5f8a414c8aa21dddacb7558386d8e844b6c622b101276ec82bcd0320366
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14043564
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,9 +328,9 @@ array set modules {
</span> }
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c1f74868be94562b74015449004744f000b259bd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4aa058e123b96c2c17cd9cf11cabbd5471b9db950d61ced23f5caa00c5174bf6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1829872
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 904cc4278bb4b5da6f77fb8003e87018804725bb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4cbc9318fb532d0fa9a147460c053d1dfc0aca019dfda271197d93e863404e5d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1837328
</span> }
""
"path:lib/pkgconfig/jasper.pc:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -338,14 +338,14 @@ array set modules {
</span> {"Qt Image Formats"}
""
"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: "
}
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4731b89c6e65948d76669285a1339713d496f834
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 629d1ba923d39e765c5a1ce420a460a048d6257586110067caf78dde19849056
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6559912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4449c52cb99c738924bec98e02e498a91a1d019e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 523ebe20028ebaa537b1ea2d4b3a3d3629126b26b235a2876fdb7e38a063dc2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6558128
</span> }
""
"path:lib/pkgconfig/icu-uc.pc:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,14 +353,14 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"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: "
}
qtlottie {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 91b53b7c9a0dae31e7ecb093a687a020fd228d81
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- efac34bbde99922b639e55fdd3b9e8b272676138302025835fe4a3a301d6800b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 84116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c8576f974993d28f0729414e302e7e325e3dcd65
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ad5acb59c8b8f10529885b1ee583ebbd85010be8d5c02b6092fba7842ca7b733
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84108
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,9 +373,9 @@ array set modules {
</span> }
qtmacextras {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5e4e96c640f000e73d92516ad4c71108088b4bb5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fe318265345819e16f7924925f9daca2ca6a9a8c3f1eb518bce4376528bbaa2a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 71220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bfff3cb63eef3caf4b0b746210a87720d1205ea8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ce3b4a9d4abc6060007adaf8d335cae4d9323eaa3a2eea338de98e6b4089f44a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 71240
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -388,9 +388,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4dffa3881a8f96282e8f10fd875332b02cda5de4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bc9ff46c687570b2efa3f31b9b8225c0da672e81f484166b41f5b1ec828fe660
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3832656
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f574f0e87040b35347b287ff0cc524290b3bc5e8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d60b9c6dc927547db5af09fd133099b5361444cb7e329a8b271980512e03304d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3830456
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -403,9 +403,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eb3fae196faf5c6e9b16554fdd4f32eca5263fe9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c10959a40ea74423630cacaa6be1acca535dbf56401bfd3003efd25cc2f9f530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 143584
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4e62ac4d2c42229fe3fbc394d499eb133f816b1e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3d654cb5799ca0199c0186d67c17cb900d91372a3596beb68a96019dc241e849
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 143428
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -418,9 +418,9 @@ array set modules {
</span> }
qtpurchasing {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dfc808a3128032e9d4d6d192334f6d5ff91a679c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a7373769cb55f1010d3fd7b23a496ff6391b5bdcf11dfda029ef8d633fafe613
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 210480
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a5b315d829b2352e849b679a07f37c282ae64804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b91ea2376f25c6a401bee67da439269bbe393f79d3e89e2f676d323936654c4e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 210476
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,9 +433,9 @@ array set modules {
</span> }
qtquick3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f4b28cd8b96c2352d6dac189eaafa86ec3118232
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0014cb005baff95dcd1f7343d68812418df4efc039c1793b3dd0479646a19c10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 55762892
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1bfddb793fcca74fd779735ee0aa8cb268e23939
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3d339dfbf5a88122da85438de489e3e6720fa0d643822c6531af7b8cb8ba29a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55773664
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -448,9 +448,9 @@ array set modules {
</span> }
qtquickcontrols {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 35f5b4c841953b86577205c860611ff5e6e8b202
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 596b181b6ebe4aa2f90e9de512cc306c08b29a9798e49cbedc4bb4c778115c56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5985492
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9e5353cd5b7b4bd28a681d3dbbec1bbf8f9908e6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ caf2e06da4776d43cd81f63851001802431b721b3aae4c43b8d344afbb6ce453
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5985792
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -463,9 +463,9 @@ array set modules {
</span> }
qtquickcontrols2 {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 507f5d26bf747cc5249ee7a362ce9da564dd1d13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c4a37bace5a0f6a9ec997097a5e331b438f4b5019d925aa2673fcc036825afb3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8290736
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 773e9bacdba1a0636be174984600cf0d279c5a27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1ca3246037b7e2718891b17b720f28048770c95fabca50abf4e29d0f45857c27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8291236
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -478,9 +478,9 @@ array set modules {
</span> }
qtquicktimeline {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 18a87d4ccf8d0f2fadb1b51e2ca8c2e6e98e351a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 44ced9a3a75f18dfd2b04923a38011d809bdfcc754f3a656bcc4bd59d413b1c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 104344
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 136f5fb4abe9ad47f898e2c8cf6cdcb156d8c688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f99fa62431c016eedcf75e7b21c0118cc0a7e14628febb4444bd858af07b1b35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 104340
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -493,9 +493,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7fb837831328c59267ed498233b374c73e62bdab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7a4e1049883d184532d821f159a56aa15012070c364a451a03d6e9be28661dd4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 377896
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fec03bc4baef84deaca0751a8988058687faa9c9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0e949c92e3d8bb3c127008cffc68d8ff8fb7e3ec0a7cd0ece8b06434876e8977
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 377660
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -508,9 +508,9 @@ array set modules {
</span> }
qtscript {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e3c47ac60690d3ac1104c442e647290ffa18393a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f522b6d4d5aba0ffa7ae716a6b333fe459e6695627304aafa3fd90c8d005d39f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2665268
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c6b3d447bb64c30041a50506f831504eb47f8fa4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3cf55b10605825d8acd0380ea2c5a50e3d081f9fda8900cc903fff2fc8b290ef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2663920
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -523,9 +523,9 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 94a7577f9d1d0e476a43e09700c427ae4074a4a9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 17debc4fbe7bc3d98624b43d47e22a0a8b871173af7afa6447d0049e35aec575
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 436640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3c9243b2850ba03417ba6f5e4b17b2e5a2697ea0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9f01b2058634a702796942ec5e70974afc7947dc7c014118af47421a74b7f723
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 436724
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -538,9 +538,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9ad9dc861d3e4cd7d31f9e49da2df4a08ea5dbfc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6d681d6a26ee1fcf6dbedc211015f10fcc481c3f88e721d68ad10aa025a9907e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2058852
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 93ed5c08be521b57b4cbb38418008b8f9290d387
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bf8034647f678266f16e0990eac3645363437b35d513290c829999e7612182c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2058784
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -553,9 +553,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- da950705d1afad7c76997140a51c47f1bf054b29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 321dc9bdd146e6a525c545290e2f004e8dc6436b4efd50c480c03abc65a80fa0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 358296
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7ea5d3d46d26b5654991600cd540aa14f87d4841
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3598f923eb9a580c92f8700a336ed6e0794b2b03dca944a40663e9dbfba05659
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 358352
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -568,9 +568,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 40a6ec449865245d02a018ad5416ec11c73061f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 549d096a9fd20c5d48bd014201afb88b570bce2be752aeaac2b2c80cb96ce275
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 323168
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b7e6fbe359fae47ce46361d63f9dd41f58c4f108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9272ad9ef426dd417eb0ef76d56df0352dae601c74af42e13e5ed23491244775
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 323288
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -583,9 +583,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1a646dafc2224b52ac7d063de679b8d399ce5e80
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a45e5960738fff11b79876605dbaf58ffae8e5e60fcde7bfc6b678f95bba5377
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 103640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1a8b3930a92c87800bbcc5b2243a732d1581e3ba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adb2106c95a98f8395eeff3352d9045a8faa4edec6b9dba0a18cdea5a51065f7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 103504
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -598,9 +598,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- da9c96dc4f3c3105f7093bc8f0c76f83d1f0fc1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c4cf9e640ad43f157c6b14ee7624047f5945288991ad5de83c9eec673bacb031
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1888600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4941e1385da35536d9cbf26fe3a576f42168bb7d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 523a816ce8dc33b60284ff6fcf173421b16ee8adde2c55541fad2bd6bf2a7199
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1889056
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -613,9 +613,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 879b6b1ffb0a4e5e8a4541f5f1187c18f53a5674
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6d0778b71b2742cb527561791d1d3d255366163d54a10f78c683a398f09ffc6c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8898140
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8734aa194d630f51c8e4582a39a3807a82f32708
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2c1486ab7e6dad76fb34642cd4f91d533e5dfeec0ee527129c2c2ed4ab283c3b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8898812
</span> }
""
"port:clang-${llvm_version}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -628,9 +628,9 @@ array set modules {
</span> }
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e1c604e56c693900068ba009b9ba508f1817d28f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c92af4171397a0ed272330b4fa0669790fcac8d050b07c8b8cc565ebeba6735e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1618860
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 58891a25375a5fb2743f9c804a398aa1d72fe622
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 295ba009b0709fc59aeff3ec9973e7664f3e1885252a71d63d264e6e6a7dbc33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1618952
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -643,9 +643,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 70ecd8af5742b956be3b9f72aed022d86adc0689
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d96cf8203b136a438c7d75b14bde70db660a791f3ac3bf6f4d0bfa6831bf0ab6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10957016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5423ff8d1c85c36065e7f5ed7ce0b6e3aa228f6a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2aab78e3b2073eb304243f08f84c9a80fde08b2968b545c56eff6329d0f4610f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10958608
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -658,9 +658,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 49171fc9dd1b35a44ecf1afeb68080b6522718f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4ed231aba0a50b222040166ca7329f5648ca2345013b6fd4780f5e8adb6515f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 210712
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55a426ca70e29abeb5766ade29c0ff84ca772a53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ddf4b1364fdaae7f6c2166ecc4400a58692fce74f31737407d0af9ff7f7db5cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 210672
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -684,9 +684,9 @@ array set modules {
</span> }
qtwebglplugin {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 37e6811eb4dd1710684d44bae23127aed639d538
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2e592b1201bc384308077298d5d708cf22470637db6371e3a207f0e9b52617d4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 75840
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c307f43e3bd9ec8ef6a79f5f985c31298aa7fdab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ af0aa699c42faf571731ed3e4649c199e5c2b20d8424ac55ee60a232feecf154
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75860
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -729,9 +729,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 24b940567691267d093839042acf7c88f0699bf4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 66ab8b5bb2e64392fe43786ca1c2fd4be3306fbc4b969aa1748e568b5d062238
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 260676
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 689872f8d03129b214c2bb8fd24cae373ad12c52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 63d471d2d4c999d5fa96cb737b9afc58c7a47abedd1f008f993382cd0e89ac13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 260696
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -744,9 +744,9 @@ array set modules {
</span> }
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e8cacfee8b289d2ec013c00125463cde3ee3114a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5439a6fe0a4a4350ec3ddaaac6ec0cebb718db99c7a146fea0b87839fc543c2b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 135256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 73226d0dc4e5e610e17547ef7187a916044f4fd5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fd27bd1b34a35bf497f3a63d40eef0c4702774fcbc56ba09a904fef41ff34f88
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 135320
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -759,9 +759,9 @@ array set modules {
</span> }
qtxmlpatterns {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 86c0399a211ca82a7f27a1c05a81c5458dc82123
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0557b711207c4fa5cef1c288aef506fd127dd3f27a5e9d1c788cc4325f90bb18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5210040
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bdfa2307694d9cf85b684b0583a5ff4751b12f7d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e71e3de9d2feb3c4e6e4000e4a0046ab26549e8e42f977cc623f39a63c1d56fc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5215904
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1065,9 +1065,6 @@ 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:#ffe0e0;'>- # Backport from 5.15.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-cve-2021-38593.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/patch-cve-2021-38593.diff b/aqua/qt5/files/patch-cve-2021-38593.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8a4cb2fd65c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-cve-2021-38593.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://invent.kde.org/qt/qt/qtbase/-/compare/081d835c040a...427df34efdcb?from_project_id=1216
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/painting/qpaintengineex.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/painting/qpaintengineex.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -415,15 +415,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clipRect = xf.inverted().mapRect(QRectF(d->exDeviceRect));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Check to avoid generating unwieldy amount of dashes that will not be visible anyway
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QRectF extentRect = cpRect & clipRect;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qreal pw = pen.widthF() ? pen.widthF() : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QRectF extentRect = cpRect.adjusted(-pw, -pw, pw, pw) & clipRect;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qreal extent = qMax(extentRect.width(), extentRect.height());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qreal patternLength = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const QVector<qreal> pattern = pen.dashPattern();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int patternSize = qMin(pattern.size(), 32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < patternSize; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patternLength += qMax(pattern.at(i), qreal(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (pen.widthF())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- patternLength *= pen.widthF();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ patternLength *= pw;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (qFuzzyIsNull(patternLength)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pen.setStyle(Qt::NoPen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (extent / patternLength > 10000) {
</span></pre><pre style='margin:0'>
</pre>