<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4b523736cd85ecc84ee723c75cffde52067c3222">https://github.com/macports/macports-ports/commit/4b523736cd85ecc84ee723c75cffde52067c3222</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4b523736cd85ecc84ee723c75cffde52067c3222
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Sep 28 15:35:41 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt6: update to 6.8.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/71031
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/71013
</span>---
_resources/port1.0/group/qt6_info-1.0.tcl | 2 +-
aqua/qt6/Portfile | 237 +++++++++++++-------------
aqua/qt6/files/CVE-2024-39936-qtbase-6.7.diff | 138 ---------------
3 files changed, 119 insertions(+), 258 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt6_info-1.0.tcl b/_resources/port1.0/group/qt6_info-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2705e74eca1..73692c15b19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt6_info-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt6_info-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ namespace eval qt6 {}
</span> # please keep in order with the most recent Qt and OS versions with the lowest indices
#
set qt6::available_versions {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt6 {6.7 {23 22 21 20}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt6 {6.8 {23 22 21 20}}
</span> qt64 {6.4 {23 22 21 20 19 18}}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f65c5a0e3d6..8394448c5d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,18 +13,18 @@ maintainers {mcalhoun @MarcusCalhoun-Lopez} \
</span> {reneeotten @reneeotten} openmaintainer
# for OpenSSLException, see source and header files in src/network/ssl of qtbase
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see also https://doc.qt.io/qt-6.7/qtnetwork-index.html#licenses-and-attributions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see also https://doc.qt.io/qt-6.8/qtnetwork-index.html#licenses-and-attributions
</span> license {LGPL-3 GPL-3 OpenSSLException}
homepage https://www.qt.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.7.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.8.0
</span>
# get Qt's version numbers
set branch [join [lrange [split ${version} .] 0 1] .]
set qt_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://www.qt.io/blog/qt-6.7-released
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://www.qt.io/blog/qt-6.8-released
</span> compiler.c_standard 2011
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,7 @@ set python_version [join [split ${python_branch} .] ""]
</span>
############################################################################### Qt Dependencies
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=6.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=6.8.0
</span> #
###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,15 +94,15 @@ set python_version [join [split ${python_branch} .] ""]
</span> # license replacement
# }
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# module info found at https://doc.qt.io/qt-6.7/qtmodules.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module info found at https://doc.qt.io/qt-6.8/qtmodules.html
</span> #
###############################################################################
array set modules {
qtbase {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4dbc3cad86d53186a94ab817ed8161e61d4a124a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 49364504
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 714e04b8bc18fe8696257540181c13e914884c09 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1bad481710aa27f872de6c9f72651f89a6107f0077003d0ebfcc9fd15cba3c75 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 49819628
</span> }
""
"port:brotli path:bin/dbus-daemon:dbus port:double-conversion port:freetype
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,9 +120,9 @@ array set modules {
</span> }
qtsvg {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 22f33e4e75d55ed9ea3eeeae3eca19640936a322 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1791468
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 716056ea1f18fc2506ce838f16906438c5eac7e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cf7a593d5e520f8177240610d9e55d5b75b0887fe5f385554ff64377f1646199 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2004952
</span> }
""
"port:zlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,9 +135,9 @@ array set modules {
</span> }
qtdeclarative {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- c723a2abaaae49a44c3e7a9d749367eda85c512f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 35629324
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 368a610969ac21e23fdae86ecbaf2ad9bd1b6ac5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3b41a36b42e919a3aa0da1f71107591504200f41707bee2ad8e8d4f99b5644c2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 37029068
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,9 +150,9 @@ array set modules {
</span> }
qtmultimedia {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- a50c11eac72ccc7485bd7af7db39424273bfe58b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8ef835115acb9a1d3d2c9f23cfacb43f2c537e3786a8ab822299a2a7765651d3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8451800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b2e0ffe396ee8e1e975fc99b877e1832c9226d34 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 28766aa562fa7aa7dfa8420defd6ece90a891a0496b8d8a4c51958182d73cfcd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9591692
</span> }
""
"path:lib/libavcodec.dylib:ffmpeg port:pulseaudio"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,9 +165,9 @@ array set modules {
</span> }
qttools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e182f7a868d3ddb5bbd1fbec72a953dbd4007aa3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9019636
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f2c4f3047f92e839853383ee38715febfd39519f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 403115d8268503c6cc6e43310c8ae28eb9e605072a5d04e4a2de8b6af39981f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9059032
</span> }
""
"port:clang-${llvm_version}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,9 +180,9 @@ array set modules {
</span> }
qttranslations {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eab4065f224be17611b7c21b6c88382133d6a77e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1547608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4d6478540ca6cc3529fe1fc84f2eeecc16e72d54 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 84bf2b67c243cd0c50a08acd7bfa9df2b1965028511815c1b6b65a0687437cb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1550184
</span> }
"port:qt6-qttools"
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,9 +195,9 @@ array set modules {
</span> }
qtdoc {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 52576e20b5ee4b5a9b4ef0310bd68a99089df0d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a0c1456cb66dc76065f287e4a607510854bb794141dd18fe7f7db9954587756d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14497164
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f217d4df5620c6ad70e321780553c72576b02ef8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3dc83a74665453b24ea2ad466d83aab3c779a0b9a01cd8bb24a12e764e9c1257 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 45988788
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,9 +210,9 @@ array set modules {
</span> }
qtlocation {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7751af00292fd3387ffaa76d347b91de8a6f5860 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f232da58bf1189b69f1f7029417ddfeffcfb801b275aedc720e38244f88a485d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3166188
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7e3e7f7b5915b4fcf3fa1e4d96752fa25a2835f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a0c487f4b36965ea921127033cc227acf1f292ba577081842c5b75d2ef9731a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3166076
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -225,9 +225,9 @@ array set modules {
</span> }
qtpositioning {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e62debaa82f6210166d87a4620c4942a6a6db53c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 020009f0aa8f6b1042963a45b6e19f2784cc937949cdb673f3b876153e087b1c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 658112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 793127c33b0f94c72d5254aa6a5d825213ecb2e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ec81463e2b01475911131b11c96d312ffd7aa90d4482bbd6a9965b189e7eeb39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 660512
</span> }
""
"port:gconf"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,9 +240,9 @@ array set modules {
</span> }
qtsensors {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 62407675be7309e4b04acbf15d0df6e1ac345992 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ead1dec787c56ed4dc02ed810af54ff1e1f6875cb5cc2506c74eeb9554e6bb59 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1497432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7cf8ecfec6d7c0e0a007d306cfbb230521cd2c34 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 723544c5fa05fab75d53d66186a7ce83fb2f6f9a770ce796306992e983dde679 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1497268
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -255,9 +255,9 @@ array set modules {
</span> }
qtconnectivity {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cc20d05f3c5ea5ba28a3cb568d180dfa96e3954d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8ed321b242f0e956473a295fa31670271f9b3acb797508644cb740f89f6c08e8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1061952
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b1c54c84dbe503fd6c63a9e62fac255343448fb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bbbefb6cc07507fcc961362b3380553eba6400aa15480600126793ba3dc21788 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1066392
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,24 +270,24 @@ array set modules {
</span> }
qt3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6e3eb85d5db74b2e0e0f619181fb0852c323d1b7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8bc087d904973133186e58471845c5df376bbfdcfcf079fda287e1cda27c8adf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 141589248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5bac3bbf78096861757bd33bb6e5d4809861bccf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3a11919e15437c351b742dbf4e0115ce51aa969cba844dd6388aae14810c7b7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 141837252
</span> }
""
"port:assimp"
"qtbase qtdeclarative qtshadertools"
{"Qt 3D"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "status = deprecated"
</span> "variant overrides: "
"revision 0"
"License: "
}
qtimageformats {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- e6f8cd5ea11686ca70a0d07c14216ba6f9f63e85 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1974768
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2a840a485beeaf5ab2f2d520c755846938bd9ca9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 595bf8557b91e1f8ebc726f1e09868a3c7e610ff5045068f2d4ea2428c49a5d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2024480
</span> }
""
"path:lib/pkgconfig/jasper.pc:jasper port:libmng port:tiff port:webp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,9 +300,9 @@ array set modules {
</span> }
qtserialbus {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b70f91b4de2c3f1e98952b3f0c486e21ffb9882f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 67641ca99b455746d7d956c516dfaa5f2c48696834c71d5720d63e736d374b2b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 547596
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c5824f724c2431d9930fb60deecf6550b0a4c922 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e69834904832c1970aefcc98c67f3b4033640129908118f368e536393bf0dafa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 547876
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,9 +315,9 @@ array set modules {
</span> }
qtserialport {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fac4def632d16259b58a103efd1c5a887aead699 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21c34cd1161cb5197bcec662d26a17647b59b6fdff5c364576883c42dbd3b4fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 271320
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1baa6dcbd726cddf0ab5d0742c5b2aca0f25223c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7767d72ecfadb1045c50d0b30b952327c242a6eb40a46780e8e01b75ad77e7c3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 271308
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -330,9 +330,9 @@ array set modules {
</span> }
qtwebsockets {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f2920d67388ddea44d071891326df9bf1b427ad3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5bde4af6ec9ce8c8632b782ab77b82d910721be2c714e6d38902521bcd1d215f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 459636
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0595c953ac383fde2854d4e216b2734d050a3535 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c14be05c46b71c2a89865987ffe0a8d40d8ecb01d48dcdca7fc02ba83a5eaf6f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 459880
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -345,9 +345,9 @@ array set modules {
</span> }
qtwebchannel {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5dfe524cd7d0128e26cc9f3f0235230457e75735 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac5d96607b10e7de546eaf93bb9f65c0fd631ef9b91ef8a794e26fd57db4501c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 206584
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2fbbaa34a615c9ef8e18eb102d3ed816f58f4e14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d6250d25bf8a8d2af608239d259ec72db6dc28f08aefc8895492ad09ebaf60c0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 207360
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -360,9 +360,9 @@ array set modules {
</span> }
qtwebengine {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7edc767b416d42e1aed55ab3d3ff7ea645666462 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c7755875594d8be382b07bf3634d44fd77012805794d8b588891709a6405ffd1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 550888844
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d91c3548fc1b28b6886a2a05fddc96eaee7904f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2484459248a8624c16b70780bef3fe4bc7f4eace2178f84233d4e711cb7f7452 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 566569136
</span> }
"path:bin/node:nodejs20 port:python${python_version} port:py${python_version}-html5lib port:py${python_version}-ply"
"port:re2 path:lib/pkgconfig/icu-uc.pc:icu port:webp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,14 +374,14 @@ array set modules {
</span> {"Qt WebEngine Qt" "Qt PDF"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> "License: "
}
qtwebview {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f5837d43e30530c5567be3b53da053783115b4e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4ce1096903d4fec39bfcd95d4015acbf105eddf66a384303cb0fe899dd24e4fe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 138764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f9ebb96ee347d0db63901623f457c460be4a3b3f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7cb89d41593876b176368b15c1cded3d5a3c4fdf7e0a10f0c61021e3e8c179f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 138956
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,9 +394,9 @@ array set modules {
</span> }
qtcharts {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 56238c19fd7fab4b10b719a287bab3b6366a9645 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 00f6a437458b7f2c4e81d748dbe2a077567a9e6ad8d8e3820b36c39dc5279bda \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4661448
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5d6ee81daeac1155957ae20a02560f3f759fb3f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1923daac0d1a69b03a4cb119b147c2e3f5080f642af365098fd8771a465b132f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4662104
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -409,9 +409,9 @@ array set modules {
</span> }
qtdatavis3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ea81be1551363d00245c1e75d1685ee78f075872 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c0ebc87d95deb595106fc68ed7e6de05149a18917d68cff40905c57fc6694e53 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3947856
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 505ac4cc2e6b736bdee262d7159a36348bf6fccf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 35f2965d13b078d6ca42c76d70a491042f0b0b533b2ec4d12ecc35e282534cff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3952536
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -424,9 +424,9 @@ array set modules {
</span> }
qtvirtualkeyboard {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0e065e42c34bc33cd24be199ba1aa4b44762601b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 320664b55a0960ff79c1b822dcf6e8cebe3e08b791147d41b570996d81ce180f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3722296
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 91e42ff19486a6daac0a4b5946295cb7f6877009 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8f6502d7f40765fb4960b804927f9d86da39bdf42acc5021353c49527b6d0ce0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3722484
</span> }
""
"port:hunspell"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -439,9 +439,9 @@ array set modules {
</span> }
qtscxml {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9b7b4f59991fd9f3a12ef4275a573ffc31c7476a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1168452
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a200937b5210b1307092e5aa6330e50f70d22ea0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bba9aa4ef441b01b2d391486ddccfb09efa378c8a24e6d13e983fc019837b43b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 557512
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -454,9 +454,9 @@ array set modules {
</span> }
qtspeech {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bf057d7c5e9df6b7a1eb8a40d510a996cdf5e293 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cc8c769404e3e49713be304a73f936890a1ef2f88d590732785f34692a4814ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 262360
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e4cb9381386eeec9b79a4dc52a2d5ac90315d040 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75230a12bc37b8535f3858c11247bf68a502e2559265243eb3b44fc917166565 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 262308
</span> }
""
"port:flite"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -469,9 +469,9 @@ array set modules {
</span> }
qtnetworkauth {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bbda190e9cf285ab7545f2eba68df8621a9370e2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7f09824fcfe589eb32260c305ff9a126fe3bf93be218d372e8e9c10e212df470 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 146892
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 711bd5b60465979625fd4ba5b8cd8b815419e840 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b95d566544c6b35d895be39473fef51985b04df2f16008de54660966ae80cc48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 253404
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -484,9 +484,9 @@ array set modules {
</span> }
qtremoteobjects {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9574d4e4957cee808db8fdbae2a7a6bc3648f49a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0b906b81aa7d6f4e47d4a298da67894433f3096a06f4c4237788c1b2cb9b7483 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 537040
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ce8f6ef4f9fa1e93ad35787976f7e52e7a7c6c6b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f1df570c6d9796e98374414f0f24f31bdd1e61f8063d6d9e2f407632559c7588 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 537064
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -499,9 +499,9 @@ array set modules {
</span> }
qtlottie {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 9963ba8fa95b238d3aac6b65da42db2de4eddf67 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d9afbc9358d352a4e521d4693d5bdad6a004272b6e8a9ec7a9f851700fe3f10e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 83636
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7bcce8b45d8b6daf701088c4ac84d69e4a0737ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cb69e6396a6b14b6fba3aa690040bbe45a7717551e0d046e841541dc1f137c96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 83688
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -514,9 +514,9 @@ array set modules {
</span> }
qtquicktimeline {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0ef60aa29e115d595ec5c0ad1ea7c659a33b6659 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 21eddea01cf095cede10362eea4fb8402ffd06868c88d50a757c8c1f6b0719eb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 110200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d75777067ceb1c2731175b8ddb6e50e4ef3fec69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1106a41bd8081903058a47a2bca3a147d594d15cc21006aa45f38c6e1dd91f08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 110192
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -529,9 +529,9 @@ array set modules {
</span> }
qtquick3d {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- df0f539fc7f8f8bd0586fc965ae23fe6556382fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bb8ff9aec6da2e2d3b3986cc859333a98b2f3d4bbe564c5733e8f1a089d15270 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 66202160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ef8ed0492373dd368fb0d8c2fbe953497ffaeeaf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3e95044ee2da33db1a6fa3f834b09e71b2491c4899bac3a3bdf0c10b06f0223f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 75282076
</span> }
""
"port:assimp"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -544,9 +544,9 @@ array set modules {
</span> }
qtshadertools {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 34cc71dcd91b5ab0a05215e8aec928185b159c8f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- edfa34c0ac8c00fcaa949df1d8e7a77d89dadd6386e683ce6c3e3b117e2f7cc1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1111256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2d8c683183cc21b8cf11c3737cbc418fe998c9de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 44692dc93482374bf3b39e96c881fa08275f0bf82958b68a7e3c796b76d4c4cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1136332
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -559,9 +559,9 @@ array set modules {
</span> }
qt5compat {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- d84116782d286c12ad10abae6d195c7ac0a96708 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8826b5189efc4d9bdb64fdb1aa89d0fdf4e53c60948ed7995621ed046e38c003 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 14632348
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f3eebb3762b7dcfbb00d7f1c307eac60df32f447 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3c9b05fdd70b6bd6ec152e6b43f2a5f4c7b31c9eb342d62fa8450d63f5835e30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 14632668
</span> }
""
"path:lib/pkgconfig/icu-uc.pc:icu port:libiconv"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -574,9 +574,9 @@ array set modules {
</span> }
qtlanguageserver {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 924f60b0fd6e1cc8a5f6cb2d11f094dd34979e61 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b659fe655144ffa061e3ae509eadb42ae373230517295a96935434340e101a92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 145660
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 36dd7ee332742ba489bdef0ddd6fd4912f74eeaf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fbf7152c8ca4d1dbdd30205e64a830f378d7ac5ac0b5f02eecab9d7501065cef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 146340
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -589,24 +589,24 @@ array set modules {
</span> }
qthttpserver {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- b248b0f951756bf784ab820bdc07821348205455 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0353b9b4f98a83fec8f15046d4ff9d6ef7c874dcbb3664092fe2508f40778b86 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 163640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 05cb06cc21e3b396b1668de4d74597ff8c124927 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 81c308c8d23a5c9062330882008143cfeff88dc783e2d5c7bfaf22c81aae797f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 177428
</span> }
""
""
"qtbase"
{"Qt HTTP Server"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "status = preview; GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GPLv3 license only"
</span> "variant overrides: "
"revision 0"
"License: {GPL-3 OpenSSLException}"
}
qtquick3dphysics {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f6255e24e607d1979b9de5e09d23fae92e4733a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffc790b8b44ebc03acc1f2d085dad0cc49fffde1eea941a6ff11d3eb0b6e4140 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4703956
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ba0ec83adb8e19a0e438791fba2541511ea8fa22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 13b35c229fe76201d0ae56b389a7c73a1df93098fe2233fc5d5b716848f1951f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4704280
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -619,9 +619,9 @@ array set modules {
</span> }
qtquickeffectmaker {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5e531ba2ff923a2205399e37976218de03635165 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3b0f26ce07c82c29f28d19b537b31c297799406428fbf0d31911464e717b756d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4358544
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dea6ab3760f6573abadb7779e8a7858b9c5e5354 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8aa1d7f3d0b27dd0845284e444dc4a5830a093648749ff3439fba2e6b48c74f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4348348
</span> }
""
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -634,15 +634,15 @@ array set modules {
</span> }
qtgraphs {
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8502878c5e6fb303f3947282e936093b7447ca04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d8813a266e4a56367af6c3206670c908f64794e6806402142b2e028046128600 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4395960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10c079a1cf6e1fd9379f783e4234d10128472ef0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4ba54a5a06593fe17fdc4eb5bed0caf6b5f9789a8d9835729e12b685960dcb42 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4815668
</span> }
""
""
"qtbase qtdeclarative qtquick3d"
{"Qt Graphs"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "status = preview"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span> "variant overrides: "
"revision 0"
"License: {GPL-3 OpenSSLException}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -733,7 +733,7 @@ array set sql_plugins {
</span> }
mysql {
MySQL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 0"
</span> {sql-mysql}
{
mariadb10_11 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1056,7 +1056,6 @@ subport ${name}-qtspeech {
</span> }
if { ${subport} eq "${name}-qtbase" || ${subport} eq "${name}-qtbase-docs" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append CVE-2024-39936-qtbase-6.7.diff
</span>
configure.pre_args-replace --prefix=${prefix} \
"-prefix ${qt6.dir}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/CVE-2024-39936-qtbase-6.7.diff b/aqua/qt6/files/CVE-2024-39936-qtbase-6.7.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7dd7e82c332..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/files/CVE-2024-39936-qtbase-6.7.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,138 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0abd99b9bc2..3631b13dc85 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/network/access/qhttp2protocolhandler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/network/access/qhttp2protocolhandler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -303,12 +303,12 @@ bool QHttp2ProtocolHandler::sendRequest()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!prefaceSent && !sendClientPreface())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!requests.size())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!prefaceSent && !sendClientPreface())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_channel->state = QHttpNetworkConnectionChannel::WritingState;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Check what was promised/pushed, maybe we do not have to send a request
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // and have a response already?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6766989690c..1e4161d1fdf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/network/access/qhttpnetworkconnectionchannel.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/network/access/qhttpnetworkconnectionchannel.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -209,6 +209,10 @@ void QHttpNetworkConnectionChannel::abort()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool QHttpNetworkConnectionChannel::sendRequest()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_ASSERT(protocolHandler);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (waitingForPotentialAbort) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ needInvokeSendRequest = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false; // this return value is unused
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return protocolHandler->sendRequest();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,21 +225,28 @@ bool QHttpNetworkConnectionChannel::sendRequest()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void QHttpNetworkConnectionChannel::sendRequestDelayed()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMetaObject::invokeMethod(this, [this] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Q_ASSERT(protocolHandler);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (reply)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- protocolHandler->sendRequest();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sendRequest();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }, Qt::ConnectionType::QueuedConnection);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void QHttpNetworkConnectionChannel::_q_receiveReply()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_ASSERT(protocolHandler);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (waitingForPotentialAbort) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ needInvokeReceiveReply = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protocolHandler->_q_receiveReply();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void QHttpNetworkConnectionChannel::_q_readyRead()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_ASSERT(protocolHandler);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (waitingForPotentialAbort) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ needInvokeReadyRead = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protocolHandler->_q_readyRead();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1239,7 +1250,18 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!h2RequestsToSend.isEmpty()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Similar to HTTP/1.1 counterpart below:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const auto &pair = std::as_const(h2RequestsToSend).first();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ waitingForPotentialAbort = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- emit pair.second->encrypted();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // We don't send or handle any received data until any effects from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // emitting encrypted() have been processed. This is necessary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // because the user may have called abort(). We may also abort the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // whole connection if the request has been aborted and there is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // no more requests to send.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QMetaObject::invokeMethod(this,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &QHttpNetworkConnectionChannel::checkAndResumeCommunication,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Qt::QueuedConnection);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // In case our peer has sent us its settings (window size, max concurrent streams etc.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // let's give _q_receiveReply a chance to read them first ('invokeMethod', QueuedConnection).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1257,6 +1279,28 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void QHttpNetworkConnectionChannel::checkAndResumeCommunication()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Q_ASSERT(connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Because HTTP/2 requires that we send a SETTINGS frame as the first thing we do, and respond
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // to a SETTINGS frame with an ACK, we need to delay any handling until we can ensure that any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // effects from emitting encrypted() have been processed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // This function is called after encrypted() was emitted, so check for changes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!reply && h2RequestsToSend.isEmpty())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ abort();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ waitingForPotentialAbort = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (needInvokeReadyRead)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _q_readyRead();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (needInvokeReceiveReply)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _q_receiveReply();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (needInvokeSendRequest)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sendRequest();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void QHttpNetworkConnectionChannel::requeueHttp2Requests()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const auto h2RequestsToSendCopy = std::exchange(h2RequestsToSend, {});
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c42290feca4..061f20fd426 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/network/access/qhttpnetworkconnectionchannel_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/network/access/qhttpnetworkconnectionchannel_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,6 +74,10 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QAbstractSocket *socket;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ssl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool isInitialized;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool waitingForPotentialAbort = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool needInvokeReceiveReply = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool needInvokeReadyRead = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool needInvokeSendRequest = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ChannelState state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QHttpNetworkRequest request; // current request, only used for HTTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QHttpNetworkReply *reply; // current reply for this request, only used for HTTP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,6 +150,8 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void closeAndResendCurrentRequest();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void resendCurrentRequest();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void checkAndResumeCommunication();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool isSocketBusy() const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool isSocketWriting() const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool isSocketWaiting() const;
</span></pre><pre style='margin:0'>
</pre>