<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e26e49cce172f58d889bfb270e61ef4419ed6114">https://github.com/macports/macports-ports/commit/e26e49cce172f58d889bfb270e61ef4419ed6114</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 e26e49cce17 qt5: update to 5.15.9
</span>e26e49cce17 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e26e49cce172f58d889bfb270e61ef4419ed6114
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Thu May 25 06:05:19 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5: update to 5.15.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apply upstream security patches (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;'> Migrate qttools to LLVM Clang 16
</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 | 236 +++++++++++++------------
aqua/qt5/files/CVE-2023-32573-qtsvg-5.15.diff | 34 ++++
aqua/qt5/files/CVE-2023-32762-qtbase-5.15.diff | 13 ++
aqua/qt5/files/CVE-2023-32763-qtbase-5.15.diff | 47 +++++
4 files changed, 217 insertions(+), 113 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 bb21f6560a3..24fd9ae8e9b 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.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_version 5.15.9
</span> version ${qt_version}
set middle_name everywhere-opensource
set worksrcdir_middle_name everywhere
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
# MacPorts LLVM/Clang version to use when required.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm_version 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version 16
</span>
############################################################################### Modules Not Considered
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,9 +188,9 @@ set llvm_version 15
</span> array set modules {
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d3599284431c3d6892f36245a94f84873b1709eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4bbb99b943870544bfbbe0760088d3443f0746484e19c858579f019e28d90ba2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 118248320
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 83b23ed0a1031a8559f6f9e7a9c0bdeb2069e82b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7a7062acdd8cd149925c727bad9f18e41020a47551be4b39306cb3dc859154c1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 118313120
</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;'>- 4210b7ea24281c6e70559df429678d12d7b120af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bfb11126c7f3abc3fdf86425ce912988b864a7e79a606d77325cffdbacb4be9c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 50259432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5693e1bc65204e0d96c592006e81b9d546104baf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1947deb9d98aaf46bf47e6659b3e1444ce6616974470523756c082041d396d1e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 50389220
</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;'>@@ -213,14 +213,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;'>- e1c2887bb9f07ab2a38860d9e57101452c0d330a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9456ed8943286959f56d075db4d3b3ff9a271ec85b0b3de3e038d164a65521e0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4254148
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2a2cca7f2f42f4ea0e5a9e6baba03cb8d3e00fd1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2ee4df662ceeda868268dd890f0e89033a4d89e7f4188f4c1b03ce315c9af816
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4253692
</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;'>- f6466ad533bb994e795e8a86e1c784e77e3ed4a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ccba61ca34ee00ecf51fd3ed9fb19617fd706d8a684068bb649cf973de7cd8c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2822448
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e8d89b21d754a322eadd24b73ec8cfec8f74bcf9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 850f40ede3647baf3fad4ac262dac9a79dd5b2037fbb35f2731131dbfa46cb56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2824968
</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;'>- 455c4e8bd24be2a045a065c3ccfac246ae7638e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b06558f6e000e04814b3349bd015dd7ee32553c9f7519eb49cb94305759b22d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5193552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 41576512a9f184482402c7f8779072cbfbc10b76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ead6744e085736525e5fe3867e0fb095cdb91d06f92c7e524844d53cd7e2bb90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5193380
</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;'>- d0b0bf3e40bfb3fb5faad72d01102bc5bbe4e10d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 026ec083b9b5f98c78b6cf38c95ca5351b374f8dd7f3e815f0d3d67d82b468cd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21592984
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fce4df235820ff2e3c85b9e19aee6ee200897918
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 124aa6e0513f8d4b33a1b351b8d0980be37522da68f7051d0db9adfcf07ba726
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 21587820
</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;'>- fbbcbeb5d9f55dfe70f7e993f0606a5fa4e60e3c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2c61ff32310b1f7ec2695b43051028a0deba103a715fcd472f4da63e558bf1a6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5767748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1a9f70cbd2c818e63f0adeb5f99de70aaac8eb99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a4db8d5635ae2e3e5797765752a14c5fd1a3a5f2009e8880bf51ebbd409f7a98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5750160
</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;'>- b81be7d59c56e828ea5439207697656292372aec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 735f7dedbaa2f2bdbd2bb2f67599fef2f13bdd97543ccd131053d1335fbefd6d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 388800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9ccf2a662f90af2d60f670617d1ab8a0f0cd0a09
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0d2ab4fb2db67711df2addf2fd47bd559696a78ccd4ac41951f8fed28b256a6b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 388984
</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;'>- 6c8e722856f4090fd62052ac21e93aac867da0f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 49aeb89d1a0399a47eec063e581ab042bad1e6445fa48651c072a6105194d773
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14043772
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ db45bdd6bec21d9cc7455275a9b95b86e7e34947
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1c2b83c0996b73cfd750032ecd24d8d72b5e9b91f131341a3cb06d976e2b2a12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14043904
</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;'>- ade7397562acb3da2de0e7e8cced396a4f51a324
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 61440ef3b0d06ef8cd6e7e297828097d885097139d9be26d9c0b16ce7ec2ce30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1843016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d683bb2c1500a535ab8c57b450a004b563c2b974
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2435f9c4ef4a03292f0a911c8da14ef6ad38775b6f97722f4a8863e1aae61ba3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1844504
</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;'>- 5ef6c33c0a70dbef527540dc33f785b80218d847
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3ccb4bcf870bc1c663623315d3dc8f786c3ca63ce6df4794ddfcba0b7cc72664
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6559180
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8f985baa1da4bb630aea801b7fb5e7e76a7bcf45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2d08ef5ee952e0bbcdd74c6664e6f6115c35a31f8299b3d5356375433e887586
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6552244
</span> }
""
"path:lib/pkgconfig/icu-uc.pc:icu port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -348,14 +348,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;'>- f8364da34240044041c65c893c00b5c114ce3f07
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a18a63a0391c11fadb8dc4176ce9950bbb15ade8770cd31b8cae59071fd4b2b5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 84136
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 54193fd18266dd3c17de95db9038af41fbe27703
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0e679af1d127cbac8f7ffaea1807ae7aefde14831dae317ad1b29d35a19db826
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84432
</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;'>- 8db2154ccdeb54bf5dc360c801b863086150c90c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e57650f557742034b27f4ca02173ba68977517dd46eec826b420aa6744f7086e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 71312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5a4eb13aaade3f91317863f52b7ef449017c156b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 951eb75c113d36dc4ce08b600dbedf84e6e5858286876e88f4499afed0ccd394
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 71588
</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;'>- f770e9f3e433fbda721c75887f9ba30984675d9a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3347791521b106d1e69ac0b28ea9a295c06dddcf592c051d366fedc9ae73e0bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3833148
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1590ed30db8f8267f8f3ccbc609ab6d6cc4f12a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 453e30affb938ea0427b82509c955cbe2d0846ef27e58aa3a53a99c27cf7c772
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3831184
</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;'>- 75bab77d2532c7a196f3d1d0b602b1aef13a6c56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 854127960477daddde3051211756d52708f9827ea751a80312c3ff3fb9bc553b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 143564
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 25a9ee072b11acbfacd0e96bfa0c69612f88aba6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 088ab0ecc8958ebbc21b44dc152515d79159e0603948a574d8097fb444a75984
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 143792
</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;'>- 672f8f87ecedc20aa222300f25db7edf827ab083
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 883358575e1ed6908afe8fa3675c02d1a85b72a072bc6114f9d0a7c76cf1532e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 308540
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7eff8a24b90407253f9859d55627dc188844bdad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e7f45fa86f50a5c017c9091f909f29caec25bfe55a5bf9cc5c7a4f5adcbbb889
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 308856
</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;'>- f747d2a3abb1d02e85d00930fecb152c1476562f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1dfe98c5ec69f7a282c8d6bf129cdcc6153873bd2f1b2bf2ca20568dea3a692c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 55765152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a017b90556821e2f070ed7a80e80034f4ad639b4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 422197661ccd36c4934ffc43116d2d4b249f223a804aa8e0caa934799e08120f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 55771472
</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;'>- 1e1ee001d0637094c146e7c20644b3aaf3cdc9d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2cb762d8aa53dacced4ddcc038c4541179c8bee51902becdd1753237ef3ae47a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5985268
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e2e9781a51104e5c5ef36307a96d7fae70051412
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 958c46e54c400f2a5e8ce04d917d302ad39181d389079b6671213b233c560b1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5983564
</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;'>- 390c6ee9f7f1141e4cbf072eae61d7b9696d9f3a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 652e71e5d068c2eb0a31716af08cebaf20a979d5bd8e6ff721ea8b238c9c0d15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8292476
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 40f9b5251edc30ec6753e19562a68842eee68225
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be2c54c5b85d921567918bd17e783f0ba10328c7eac01439fbf26192cb878882
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8291756
</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;'>- 80204afb7779b2e1dbb0f4d59e32917a485f6820
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 298473fca0d2113de7422e5b7cb7605d8961652ee3af98c8753f979b5f52706a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 104348
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eb7e938a49bc17406e415b6a8a549b518ad92d96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b01ded88b511787bb229347820e1c82989b40441705fb25680648be888e8d671
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 104724
</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;'>- 4b70ea09f322c34317b6b516fd72b100452b0bcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a4c83f796a7bb52f97a23ac4bd7f6718e14274e4c55d14549b9a317fe3f729ae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 378928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5742d4b339a7b4b80f3017eb6e1c452c5e0b5643
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dadbc8cea632471db8ed52864b1047d2bc756c828a4690c23b40b3eebf415753
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 378908
</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;'>- 3658ff2fa8457e094c1fea690a63c1dd05c51a56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9ad546f081d479c73dbdd16c567076dc8763d4ef3a7e0b3e06b87107ec0d5266
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2665424
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 58e029f4e84e9a3cce3c019244a50327d04a03d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 486fbb453a5e011a3d2245b3475c1e960bb0a29c7a1f8041a778c80097b0376c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2666040
</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;'>- 186df7ee26057dac208768a094634b48c3dead56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 36d46988ece57051258328a58cc2fc0ece7a880dd0ed8ab3a703a3fcf6b5469e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 436864
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a22b83b8d251edbf0f352078666b59ac755f5ce1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b15e74e37366d8d08e2ae649b992ded7dee2952b3b8e5a418d2a57f6c0d8d043
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 436620
</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;'>- fec2e4aa9c5a88d5f480433d2fc42d67a4f09af1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a654374a459a53ed946789b672d8be266d883f034c7976a3674af63de37ab7b9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2058928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 159edf3501c37e17f10bc634a37adeea9519ade5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7f8790b40302b8178c404a9a23a43724871996882ff249d08642651f6ac6018c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2058448
</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;'>- 3c6794eb6b1cbb76e6d87f5bd9718c3fbb914823
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e094bfe9430468eee6e717d179ea987ee9e81f2c0a038c66220e3d7297bc4373
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 358400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6c599763cc88df5296cb04c0106f1b3842ff5ed0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e9124618e18e07ba9ea83f21532ff0e8c2c02e6d6966621d001fcc9febcb93a2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 358380
</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;'>- 8c5151b8ae7244d0d187b60348db9ae1b59632f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5beca29ffb31225f9e3a9a3b909cb96efc557c17dcef3467235c075a7dbb2812
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 323200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84198763f84ec07d6b806109c917729bc600c4d6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 67d20803f08b33973d7eded2e5c75083704e43b005d4c3bc9c6e8a91755bc025
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 323496
</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;'>- d9b9a1d4efb3c98fb360cfca08b51c40fdcb640e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e6160e0d6087aaed28c11e9f550f23d156008066cffc2245e9ba007da4a7a6e0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 103728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8edba708017559d073d875e4eedecaf8c2acb54b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4f9f7db0e919f782863c73ea872283ca905d6464221b9b789bfa0f4460e92a90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 104024
</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;'>- f07c7bafb1824e52f030574c1e936836a634da30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9c2fba3e7fd06ee629b159804703466469679e3153f5c313c6e42a59ee66d562
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1888824
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2b0cebbbf6dd605fc4e8e13a6f46a7ac6c605043
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 881f75d3c4a29a4ef88202763115c19d4869af2638227e9c3474e422639abb5a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1889044
</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;'>- 0346746eccf51a33a8817e302da2deb9d60452fa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a3bef8de13032dae17450f5df35e8abbb4f41f71e3b628871d3da5633577e9c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8898368
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4777108f39a18a7151ba51174a80c9caec900471
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 40dce7845bc156dce7878b304e05b19f1ce7dedd4221c67af3bdf0138196006d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8898188
</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;'>- e110d6d74d357e938ad99a1cf73e6ef47ddb0f47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0b28cc71185adbc2e6f99b45ca78f7cfa1be5202b6d2977c3f044f243a943b55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1634516
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e5a433bee81dcee1fdc2ea8ae8a0ef15e8345f43
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 35f4c4496e8a1f0605b3fb2e28c4b08e191796c9c03c32175a608e9c4dc4bb60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1635128
</span> }
""
"port:qt5-qttools"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -633,14 +633,14 @@ array set modules {
</span> {"translation files"}
""
"variant overrides: ~examples ~tests ~debug noarch ~docs"
<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: "
}
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1ff5578c57cda6fc1c23667f0d29c0a5ebc62a16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a7e563bc35bcebe945dba3f25b626d423c58981c9d4344394783548213946dea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10965644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0e54d15e99e793def3469e833c1449521932ca6a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5b31a91ea95562fa5d5ceb08b22b06adfcb20a2b90385f905a71dddb9dc88bf0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10962880
</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;'>- 241bbcd888a6fa44637d46662a2656aa23e5d3c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f6e5e806f6d04e4dfdb00a1cec40757aef11fc3019a4b2245787e8889df1d5dd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 210788
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2d5c5e8f1ee1cc2c2562abb95ebd320b280a3d96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 594a350bd92665df33a5839cf66ac1e43911e7653f4fc796b4a30aa85b428789
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 211032
</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;'>- 41f1d97cd9947458c1560cc9da3cea77eb055099
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c1ae7ba6b2fdfe8faedb88395d3a7cdcac5e94f4e5b9105eb96d9662dd837fbf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 75876
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9f33d1f1197e62f6fdf1d8ac514908b0b50c508a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ebdfce37cad0b923784ba373efa39d827ea73ffb5fd57400b6264ffde98f8815
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 76264
</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;'>- 248fe06d927ca8d4a96de1d38cc33da366385a0d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ea9231b5cc4c9437c568605873d6eb97f09a4009d70cece793f40a792910058a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 260804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 160b1a4f4c59cbaff29b5e1aaf18c54a0fb9fecf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 059bf13cdec01f7f8aa082bb9c40a72afde2d12d6bbfc703f4f723b768558e46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 260972
</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;'>- fcada0c2594aadbef384e0f8fbdb7992932054e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 72a67812ca30fb08edbb8d1edb3fdf31a4ad0f2b20e451a2b08020e7e86f03ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 135372
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 51278faf4c31f7e1caf17f2bcf4bf67e8b54330d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1f2128f97a6092aa8aa79ff9c49de5f0dd885f1cd918ad1f6db20db0041dbbea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 135696
</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;'>- a9ea82f6a8596f9d6179500d1348e2d871146904
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 65e0f666234752d9f4e2835fee219ae6860f9daabaf18b953ba52831b23acec6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5210520
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5e492b48afd0d0f9d337141dc07e00213f22742d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bb674703ba72d304698991d9d8dc20eace2bd4d8e0b5704b042cc19d873960e9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5190900
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1075,6 +1075,11 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/59315
minimum_developerversions 16 9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append {*}{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2023-32762-qtbase-5.15.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVE-2023-32763-qtbase-5.15.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Neither "pkg-config --cflags Qt5Core" nor "pkg-config --cflags-only-I Qt5Core" will allow
# a configure script to find CPPFLAGS since the include mechanism relies on
# -F and -framework BOTH being set
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1917,6 +1922,11 @@ foreach {module module_info} [array get modules] {
</span> depends_lib-append port:${name}-qttools
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${module} eq "qtsvg" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append CVE-2023-32573-qtsvg-5.15.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/CVE-2023-32573-qtsvg-5.15.diff b/aqua/qt5/files/CVE-2023-32573-qtsvg-5.15.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6de2a8a1fc8
</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-32573-qtsvg-5.15.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/svg/qsvgfont_p.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/svg/qsvgfont_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,6 +74,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QSvgFont(qreal horizAdvX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void setFamilyName(const QString &name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,9 +87,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString m_familyName;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qreal m_unitsPerEm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qreal m_ascent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qreal m_descent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qreal m_horizAdvX;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QHash<QChar, QSvgGlyph> m_glyphs;
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/svg/qsvghandler.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/svg/qsvghandler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2668,7 +2668,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qreal unitsPerEm = toDouble(unitsPerEmStr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!unitsPerEm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unitsPerEm = 1000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!name.isEmpty())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ font->setFamilyName(name);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/CVE-2023-32762-qtbase-5.15.diff b/aqua/qt5/files/CVE-2023-32762-qtbase-5.15.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2d707fdb5c1
</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-32762-qtbase-5.15.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/network/access/qhsts.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/network/access/qhsts.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,8 +364,8 @@ quoted-pair = "\" CHAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool QHstsHeaderParser::parse(const QList<QPair<QByteArray, QByteArray>> &headers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (const auto &h : headers) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // We use '==' since header name was already 'trimmed' for us:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (h.first == "Strict-Transport-Security") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // We compare directly because header name was already 'trimmed' for us:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header = h.second;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // RFC6797, 8.1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/CVE-2023-32763-qtbase-5.15.diff b/aqua/qt5/files/CVE-2023-32763-qtbase-5.15.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e6f0d6f8f1f
</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-32763-qtbase-5.15.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/painting/qfixed_p.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/painting/qfixed_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtGui/private/qtguiglobal_p.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "QtCore/qdebug.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "QtCore/qpoint.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QtCore/private/qnumeric_p.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "QtCore/qsize.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,6 +183,14 @@ Q_DECL_CONSTEXPR inline bool operator<(int i, const QFixed &f) { return i * 64 <
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_DECL_CONSTEXPR inline bool operator>(const QFixed &f, int i) { return f.value() > i * 64; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_DECL_CONSTEXPR inline bool operator>(int i, const QFixed &f) { return i * 64 > f.value(); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++inline bool qAddOverflow(QFixed v1, QFixed v2, QFixed *r)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int val;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool result = add_overflow(v1.value(), v2.value(), &val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ r->setValue(val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return result;
</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;'>+ #ifndef QT_NO_DEBUG_STREAM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline QDebug &operator<<(QDebug &dbg, const QFixed &f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { return dbg << f.toReal(); }
</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;'>+--- src/gui/text/qtextlayout.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/text/qtextlayout.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2163,11 +2163,14 @@ found:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eng->maxWidth = qMax(eng->maxWidth, line.textWidth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eng->minWidth = qMax(eng->minWidth, lbh.minw);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eng->maxWidth += line.textWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (qAddOverflow(eng->maxWidth, line.textWidth, &eng->maxWidth))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eng->maxWidth = QFIXED_MAX;
</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;'>+- if (line.textWidth > 0 && item < eng->layoutData->items.size())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eng->maxWidth += lbh.spaceData.textWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (line.textWidth > 0 && item < eng->layoutData->items.size()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (qAddOverflow(eng->maxWidth, lbh.spaceData.textWidth, &eng->maxWidth))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eng->maxWidth = QFIXED_MAX;
</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;'>+ line.textWidth += trailingSpace;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lbh.spaceData.length) {
</span></pre><pre style='margin:0'>
</pre>