diff options
Diffstat (limited to 'dev-qt')
54 files changed, 475 insertions, 772 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex d8ed8f83e71b..a93a5a9f4ae4 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest index 827fedb79068..55786cc80e53 100644 --- a/dev-qt/qt3d/Manifest +++ b/dev-qt/qt3d/Manifest @@ -1,3 +1,5 @@ DIST qt3d-everywhere-opensource-src-5.15.9.tar.xz 118313120 BLAKE2B db810daf18491eedd3cc545481c3dda387469171bce2b599cf96152ca0322d0dd51ee6382fb4d87266eb2c580babb6b018de3edb8c8e5c0561c6144733ef85b6 SHA512 4c88af3855c22ab6dd17fca835eabc0facec446e254b329f76b7c61002bc4b47e7029aba6336e47b89c30c2dd50090e925042af8199f1fbb1f65558784cdc9ce +DIST qt3d-everywhere-src-6.5.1.tar.xz 161708832 BLAKE2B b10a61591132d0ad5c6de5a7032ec8a397ff670c0f79376ee6d37dfd9377717912c554fa79637e13f0efe03ef3c003b70424a215cc7bf0f66675a20f05f2293f SHA512 a5b3e4431c8924eb75cd23a806d05334aa9bca884bcbc0973359fb4c79370774fde26ca485826b1aa861362d65b51aafca93a909aed265a59cc0e60d9aceabb3 EBUILD qt3d-5.15.9.ebuild 948 BLAKE2B aefde923b2946495d82760f4a446bb53d21bde558cd2ae500afeb92b7435aa24ebcdb0fdadb4e54bf198e679bdc72bf5303417c77c9bbec99c68eea1d387b56b SHA512 3750f03d8d4937fdc1407325016835ba8885679e8cc3100b537102091fcd6c59cd0db120f7b4db8199c8ce00ad65107634539f41d11d9edc25be9728be2111be +EBUILD qt3d-6.5.1.ebuild 958 BLAKE2B e00d4c63841c4f72bcf862f7dd5a68e17b565f0fdfe8acf774942de897c2c2bb857d5de67809d81db013f74d01dcbc2a0dba67b8d7ec8c247400de6529228761 SHA512 e9381edca0e4ea61c424704b2a2fa4f16a8c31d71c40e6d302176159e180125f65702237ef440cb571ec8a12424eaf8e09ca7bd491e98d3e81596bc44fad4b5d MISC metadata.xml 645 BLAKE2B 6534d1e6a8b8a5d8d41683988ce5001a1c92fe5eecae9fe1942c8a28985ff8a0c60318621f839ab4baa9c6738ce3dd0c4128280c6e1c5b3a8dcd86251a1e08eb SHA512 5f2b1e19665e5f9bda13f708f6f35321fbe6b8451e590a6e29275e23d6df4080d2ddb5bace49cdaeb1352117369b7e01404a64539e3d2edbda41420c95792a61 diff --git a/dev-qt/qt3d/qt3d-6.5.1.ebuild b/dev-qt/qt3d/qt3d-6.5.1.ebuild new file mode 100644 index 000000000000..d62b749fbe0a --- /dev/null +++ b/dev-qt/qt3d/qt3d-6.5.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="3D rendering module for the Qt6 framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="" + +RDEPEND=" + =dev-qt/qtbase-${PV}*[concurrent,gui,network,opengl,vulkan,widgets] + =dev-qt/qtdeclarative-${PV}*[widgets] + =dev-qt/qtmultimedia-${PV}* + =dev-qt/qtshadertools-${PV}* + media-libs/assimp:= +" +DEPEND="${RDEPEND} + dev-util/vulkan-headers +" + +# No qtgamepad branching since 6.3. +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_opengl=ON + -DQT_FEATURE_qt3d_animation=ON + -DQT_FEATURE_qt3d_extras=ON + -DQT_FEATURE_qt3d_input=ON + -DQT_FEATURE_qt3d_logic=ON + -DQT_FEATURE_qt3d_render=ON + -DQT_FEATURE_qt3d_rhi_renderer=ON + -DQT_FEATURE_qt3d_system_assimp=ON + -DQT_FEATURE_regularexpression=ON + -DQT_FEATURE_system_zlib=ON + -DQT_FEATURE_vulkan=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest index 08fa71b4055d..13045948ec6c 100644 --- a/dev-qt/qt5compat/Manifest +++ b/dev-qt/qt5compat/Manifest @@ -1,3 +1,3 @@ -DIST qt5compat-everywhere-src-6.5.0.tar.xz 14638216 BLAKE2B ff1a9a9d52bd089e5dafe53ae518ad7f7d0c2c52ad9b309f84465bd45dbe6167d30bc5df4ac53d1983625c4136fe682efccacf7c9969828f709e9e8df7fc44ca SHA512 097f6cda4dee6eac8dd224d8539c26c1c016cb065f1718040f1b8e0b230b562f9b46f05d20655d30fe719d0886e02961a6dfbe7226d0dcc30f7145fe2f32a000 -EBUILD qt5compat-6.5.0.ebuild 358 BLAKE2B aab99f2828cd5855a96cd9faa547326a7d5ab822b046992e869caf648dd9d2ff5acce124ba012b3a9231d7da66cc316c7e94f3dd48ae4157f8ad74347763085e SHA512 8aed9d94121bad08c4d0d216612bbb94ccbd58d8b0f64d0ad213ae977707b63b9d95d95edebeb0353f4a0f0ed37a9fb962f637434e01837ad6528c052bbd062e +DIST qt5compat-everywhere-src-6.5.1.tar.xz 14638620 BLAKE2B 633f53dff9dd7f586018caf18cfdce0564684e7c9a7e2747dac087501f049370a91a10494e5b7f103fdbac42c163188d5fb6166cfdbaad7bb0f2230e7c14620b SHA512 513de021e2ab3413399b9f8cb7e86e744af468e28f1d11c1024d49650ac6658939e7e96607432511aa4095e6e122b9434f36e43ea712e657b10d7dfa0bd08b7d +EBUILD qt5compat-6.5.1.ebuild 358 BLAKE2B aab99f2828cd5855a96cd9faa547326a7d5ab822b046992e869caf648dd9d2ff5acce124ba012b3a9231d7da66cc316c7e94f3dd48ae4157f8ad74347763085e SHA512 8aed9d94121bad08c4d0d216612bbb94ccbd58d8b0f64d0ad213ae977707b63b9d95d95edebeb0353f4a0f0ed37a9fb962f637434e01837ad6528c052bbd062e MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qt5compat/qt5compat-6.5.0.ebuild b/dev-qt/qt5compat/qt5compat-6.5.1.ebuild index e930872d0c3d..e930872d0c3d 100644 --- a/dev-qt/qt5compat/qt5compat-6.5.0.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.5.1.ebuild diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 29e80d7ee5e6..def4801572f2 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1,6 +1,4 @@ -AUX qtbase-6.5.0-CVE-2023-32762.patch 2425 BLAKE2B 3a69063ebf4e94debe19eb97747e7fcbae626177ae265d44a4cca5576584192b6d878d65241dbc2c6e791ae8e7163835d274bc3387fe4035901a8d7c9e14470a SHA512 6631f772416fdd1d870fc98377617003d892e100357995b540d9e6abb5fedc9620a69042d8ba64fa72f3c03728a084e04cf8bf6256ba02dde8236060de9bfa79 -AUX qtbase-6.5.0-CVE-2023-33285.patch 4119 BLAKE2B cb1cb7e9a5feebc56e9e6c0707bef0eba45574d2e4a41f46a7735ffcf94c5c3db6c6a9531cb50074466888582e02eb353f48f79e82ed3e60b167f14d63cf059a SHA512 a2e4e75a1cefc83ac3deeac9e55d20bc9dfe79b7fc738863b88320f49d0de4362a8f3e05269e61b3e675b77d7a728254903fdda2ebd19a2b7b93a43e4674cfe4 -AUX qtbase-6.5.0-setActiveWindow-deprecated-version.patch 1237 BLAKE2B 5a0dee47bded6460d4643964b54bcccde2a286b6d8ffe6201781814fe6a19f2ec5d07c91bdda68004cc5a516e74a7437fba4959326d150d93ece9e834756d2ba SHA512 019d88b27295a62087f27c655afced7f59576bcb2faa8c791a303f8254d359fa006f6a2aafd665812c646c535665783cc2b1a0dfa26043407122ef462b260d06 -DIST qtbase-everywhere-src-6.5.0.tar.xz 48020636 BLAKE2B 234000eeb6e1b57a1c7561613bf437453fc2db0d23d5ddd61c38961311a7de5263c086864554aff7a0bc1e5a406af78ef8342eed3c8a5f48b9237912614f380b SHA512 29f70b9a9650afdd8e34703a7a8191feab4c3a25d0bc3a41010ea842389335b24e2685721fdb4a03653475ebd9bf8a8e4f4a77bf5d64b1289590b5ca0e4623f3 -EBUILD qtbase-6.5.0-r3.ebuild 5141 BLAKE2B f854b8898d8badde636833732fb1e4a5497d7be6f539b17296d62e3a5de6f76d935f8cce1cbdf530eaae217a974857f8ca22969975368627955975f69530a4ab SHA512 6e59666648f738ded48583135a299773c13a5fe8106f613b3ceac526e43cdcca641b7118edd25348d1341e8ec582ec565e1fba96522269ac22e3c80f05a7c38b +AUX qtbase-6.5.1-CVE-2023-34410.patch 2731 BLAKE2B a0b894782aad05e904e76112391df4895606fa95cdd6365bdfcf5096be769750c4e3c5a331a43498d5a4c84b712a4df595eb4c629fa47e458fda6475c7ff8451 SHA512 eb19ff548835ca208d1209fc8c712dfb2cca91170b23535e87879e843d599bf5d4939b2f3d9c47ef73c238ff8c939f6fd85f0b5300ee97457a4bae76d0d29f67 +DIST qtbase-everywhere-src-6.5.1.tar.xz 48287392 BLAKE2B 47872492f21a936d980891c28df61591380bc236adc66b57a90fbb87dd292cdeb3c632fb1159231ba40142d25e02944e4c5e8568153f1286e0a1abc8c5b26699 SHA512 7f7b20bbc25cda65266d6067cdd68e3e077636988d67dbf5783f79a61186135fb3a36d57ac72cfe4501012035b630ab1f5849148e4817726d4f459fa1937e91a +EBUILD qtbase-6.5.1.ebuild 5024 BLAKE2B 7f1a1ee51b3a887c8f8331102a2b4c96276164af8e03ceadc3fd1392fc6c603e8aed11ecb6c1d068bd5668fe59cc49420837ad0cc9a9427c90ce532e7720e370 SHA512 032e019184ab6c78aae283dbdc7595b6f62844f75b62a8b299b40d692c8100ddb9277b8a204b1f38767929bdb1ae2f14e023f0e31fe35789b56c3b8839e0160e MISC metadata.xml 1762 BLAKE2B fd53799e4a3668fb8d32798f1d128df86aaa7181563655ffb71d6c15a7bab33e5fb08f3c5b41695e8fee4a46f5a5216030d0aeb0927eaeec387136ec66964a8f SHA512 6e05599e981d07f7a6d79eda9e1ef9e41383e05aec5442fed8a46be87245b6e9a77fb9b469fe656f9fdd29ffb69767136c0922baed3c5448ca8c58ee70ad713d diff --git a/dev-qt/qtbase/files/qtbase-6.5.0-CVE-2023-32762.patch b/dev-qt/qtbase/files/qtbase-6.5.0-CVE-2023-32762.patch deleted file mode 100644 index 3574706fcd85..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.5.0-CVE-2023-32762.patch +++ /dev/null @@ -1,54 +0,0 @@ -From eae7c36d681acfb82572b56e24bbb2cd42242e57 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> -Date: Fri, 5 May 2023 11:07:26 +0200 -Subject: [PATCH] Hsts: match header names case insensitively - -Header field names are always considered to be case-insensitive. - -Fixes: QTBUG-113392 -Change-Id: Ifb4def4bb7f2ac070416cdc76581a769f1e52b43 -Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> -Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> -Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> -(cherry picked from commit 1b736a815be0222f4b24289cf17575fc15707305) -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> ---- - src/network/access/qhsts.cpp | 4 ++-- - tests/auto/network/access/hsts/tst_qhsts.cpp | 6 ++++++ - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/network/access/qhsts.cpp b/src/network/access/qhsts.cpp -index 39905f354807..82deede17298 100644 ---- a/src/network/access/qhsts.cpp -+++ b/src/network/access/qhsts.cpp -@@ -327,8 +327,8 @@ quoted-pair = "\" CHAR - bool QHstsHeaderParser::parse(const QList<QPair<QByteArray, QByteArray>> &headers) - { - for (const auto &h : headers) { -- // We use '==' since header name was already 'trimmed' for us: -- if (h.first == "Strict-Transport-Security") { -+ // We compare directly because header name was already 'trimmed' for us: -+ if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) { - header = h.second; - // RFC6797, 8.1: - // -diff --git a/tests/auto/network/access/hsts/tst_qhsts.cpp b/tests/auto/network/access/hsts/tst_qhsts.cpp -index 252f5e8f5792..97a2d2889e57 100644 ---- a/tests/auto/network/access/hsts/tst_qhsts.cpp -+++ b/tests/auto/network/access/hsts/tst_qhsts.cpp -@@ -216,6 +216,12 @@ void tst_QHsts::testSTSHeaderParser() - QVERIFY(parser.expirationDate() > QDateTime::currentDateTimeUtc()); - QVERIFY(parser.includeSubDomains()); - -+ list.pop_back(); -+ list << Header("strict-transport-security", "includeSubDomains;max-age=1000"); -+ QVERIFY(parser.parse(list)); -+ QVERIFY(parser.expirationDate() > QDateTime::currentDateTimeUtc()); -+ QVERIFY(parser.includeSubDomains()); -+ - list.pop_back(); - // Invalid (includeSubDomains twice): - list << Header("Strict-Transport-Security", "max-age = 1000 ; includeSubDomains;includeSubDomains"); --- -2.16.3 - diff --git a/dev-qt/qtbase/files/qtbase-6.5.0-CVE-2023-33285.patch b/dev-qt/qtbase/files/qtbase-6.5.0-CVE-2023-33285.patch deleted file mode 100644 index c982cce36e9e..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.5.0-CVE-2023-33285.patch +++ /dev/null @@ -1,101 +0,0 @@ -From a2dc11b37fd71f785c342c40549f54edfdd1a6f8 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Thu, 11 May 2023 21:40:15 -0700 -Subject: [PATCH] QDnsLookup/Unix: make sure we don't overflow the buffer -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -The DNS Records are variable length and encode their size in 16 bits -before the Record Data (RDATA). Ensure that both the RDATA and the -Record header fields before it fall inside the buffer we have. - -Additionally reject any replies containing more than one query records. - -[ChangeLog][QtNetwork][QDnsLookup] Fixed a bug that could cause a buffer -overflow in Unix systems while parsing corrupt, malicious, or truncated -replies. - -Pick-to: 5.15 6.2 6.5.1 -Change-Id: I3e3bfef633af4130a03afffd175e4b9547654b95 -Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> -Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> -(cherry picked from commit 7dba2c87619d558a61a30eb30cc1d9c3fe6df94c) -Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> ---- - src/network/kernel/qdnslookup_unix.cpp | 31 +++++++++++++++++++++++++------ - 1 file changed, 25 insertions(+), 6 deletions(-) - -diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp -index 8db79028f775..ad7bb51f67a5 100644 ---- a/src/network/kernel/qdnslookup_unix.cpp -+++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -193,7 +193,6 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - // responseLength in case of error, we still can extract the - // exact error code from the response. - HEADER *header = (HEADER*)response; -- const int answerCount = ntohs(header->ancount); - switch (header->rcode) { - case NOERROR: - break; -@@ -227,18 +226,31 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - return; - } - -- // Skip the query host, type (2 bytes) and class (2 bytes). - char host[PACKETSZ], answer[PACKETSZ]; - unsigned char *p = response + sizeof(HEADER); -- int status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); -- if (status < 0) { -+ int status; -+ -+ if (ntohs(header->qdcount) == 1) { -+ // Skip the query host, type (2 bytes) and class (2 bytes). -+ status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); -+ if (status < 0) { -+ reply->error = QDnsLookup::InvalidReplyError; -+ reply->errorString = tr("Could not expand domain name"); -+ return; -+ } -+ if ((p - response) + status + 4 >= responseLength) -+ header->qdcount = 0xffff; // invalid reply below -+ else -+ p += status + 4; -+ } -+ if (ntohs(header->qdcount) > 1) { - reply->error = QDnsLookup::InvalidReplyError; -- reply->errorString = tr("Could not expand domain name"); -+ reply->errorString = tr("Invalid reply received"); - return; - } -- p += status + 4; - - // Extract results. -+ const int answerCount = ntohs(header->ancount); - int answerIndex = 0; - while ((p < response + responseLength) && (answerIndex < answerCount)) { - status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); -@@ -250,6 +262,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - const QString name = QUrl::fromAce(host); - - p += status; -+ -+ if ((p - response) + 10 > responseLength) { -+ // probably just a truncated reply, return what we have -+ return; -+ } - const quint16 type = (p[0] << 8) | p[1]; - p += 2; // RR type - p += 2; // RR class -@@ -257,6 +274,8 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - p += 4; - const quint16 size = (p[0] << 8) | p[1]; - p += 2; -+ if ((p - response) + size > responseLength) -+ return; // truncated - - if (type == QDnsLookup::A) { - if (size != 4) { --- -2.16.3 - diff --git a/dev-qt/qtbase/files/qtbase-6.5.0-setActiveWindow-deprecated-version.patch b/dev-qt/qtbase/files/qtbase-6.5.0-setActiveWindow-deprecated-version.patch deleted file mode 100644 index 0ba60e01e02a..000000000000 --- a/dev-qt/qtbase/files/qtbase-6.5.0-setActiveWindow-deprecated-version.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream commit: https://code.qt.io/cgit/qt/qtbase.git/commit/?h=6.5&id=bbb330c95fd - -From bbb330c95fdf6161b23227cb08cec58cca31e465 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@kdab.com> -Date: Tue, 14 Mar 2023 19:14:41 +0100 -Subject: QApplication: Fix DEPRECATED_VERSION for setActiveWindow - -It's not deprecated in 6.4, only 6.5 - -Change-Id: I86a09b9ce5a7f4d8b1d80a6e67218dfe00f93844 -Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> -(cherry picked from commit 99975ec07feb6b1a9f6be9e0d392a35e40f9550a) -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> ---- - src/widgets/kernel/qapplication.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h -index c4c73d4cf8..fd698fb69f 100644 ---- a/src/widgets/kernel/qapplication.h -+++ b/src/widgets/kernel/qapplication.h -@@ -79,8 +79,8 @@ public: - - static QWidget *activeWindow(); - --#if QT_DEPRECATED_SINCE(6,4) -- QT_DEPRECATED_VERSION_X_6_4("Use QWidget::activateWindow() instead.") -+#if QT_DEPRECATED_SINCE(6, 5) -+ QT_DEPRECATED_VERSION_X_6_5("Use QWidget::activateWindow() instead.") - static void setActiveWindow(QWidget* act); - #endif - --- -cgit v1.2.3 - diff --git a/dev-qt/qtbase/files/qtbase-6.5.1-CVE-2023-34410.patch b/dev-qt/qtbase/files/qtbase-6.5.1-CVE-2023-34410.patch new file mode 100644 index 000000000000..6f1264709e01 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.5.1-CVE-2023-34410.patch @@ -0,0 +1,54 @@ +From: https://lists.qt-project.org/pipermail/development/2023-June/044031.html + +--- a/src/plugins/tls/schannel/qtls_schannel.cpp ++++ b/src/plugins/tls/schannel/qtls_schannel.cpp +@@ -2106,6 +2106,27 @@ bool TlsCryptographSchannel::verifyCertContext(CERT_CONTEXT *certContext) + verifyDepth = DWORD(q->peerVerifyDepth()); + + const auto &caCertificates = q->sslConfiguration().caCertificates(); ++ ++ if (!rootCertOnDemandLoadingAllowed() ++ && !(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN) ++ && (q->peerVerifyMode() == QSslSocket::VerifyPeer ++ || (isClient && q->peerVerifyMode() == QSslSocket::AutoVerifyPeer))) { ++ // When verifying a peer Windows "helpfully" builds a chain that ++ // may include roots from the system store. But we don't want that if ++ // the user has set their own CA certificates. ++ // Since Windows claims this is not a partial chain the root is included ++ // and we have to check that it is one of our configured CAs. ++ CERT_CHAIN_ELEMENT *element = chain->rgpElement[chain->cElement - 1]; ++ QSslCertificate certificate = getCertificateFromChainElement(element); ++ if (!caCertificates.contains(certificate)) { ++ auto error = QSslError(QSslError::CertificateUntrusted, certificate); ++ sslErrors += error; ++ emit q->peerVerifyError(error); ++ if (q->state() != QAbstractSocket::ConnectedState) ++ return false; ++ } ++ } ++ + QList<QSslCertificate> peerCertificateChain; + for (DWORD i = 0; i < verifyDepth; i++) { + CERT_CHAIN_ELEMENT *element = chain->rgpElement[i]; + +--- a/src/network/ssl/qsslsocket.cpp ++++ b/src/network/ssl/qsslsocket.cpp +@@ -1973,6 +1973,10 @@ QSslSocketPrivate::QSslSocketPrivate() + , flushTriggered(false) + { + QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration); ++ // If the global configuration doesn't allow root certificates to be loaded ++ // on demand then we have to disable it for this socket as well. ++ if (!configuration.allowRootCertOnDemandLoading) ++ allowRootCertOnDemandLoading = false; + + const auto *tlsBackend = tlsBackendInUse(); + if (!tlsBackend) { +@@ -2281,6 +2285,7 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri + ptr->sessionProtocol = global->sessionProtocol; + ptr->ciphers = global->ciphers; + ptr->caCertificates = global->caCertificates; ++ ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading; + ptr->protocol = global->protocol; + ptr->peerVerifyMode = global->peerVerifyMode; + ptr->peerVerifyDepth = global->peerVerifyDepth; diff --git a/dev-qt/qtbase/qtbase-6.5.0-r3.ebuild b/dev-qt/qtbase/qtbase-6.5.1.ebuild index c0afe61d6725..770570eb3710 100644 --- a/dev-qt/qtbase/qtbase-6.5.0-r3.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.1.ebuild @@ -103,11 +103,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-6.5.0-setActiveWindow-deprecated-version.patch" - "${FILESDIR}/${PN}-6.5.0-CVE-2023-32762.patch" - "${FILESDIR}/${PN}-6.5.0-CVE-2023-33285.patch" -) +PATCHES=( "${FILESDIR}/${PN}-6.5.1-CVE-2023-34410.patch" ) src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest index b019e2a0d726..0f760a3fbaed 100644 --- a/dev-qt/qtcharts/Manifest +++ b/dev-qt/qtcharts/Manifest @@ -1,5 +1,5 @@ DIST qtcharts-everywhere-opensource-src-5.15.9.tar.xz 4253692 BLAKE2B 9fdb2dbe9a38204e357073fbc1c72a0420ed922d44f41ff3cddc0fd1409ab002f5beed4991974bda0c3f2be868ce570fc2406efa7825c0d9ccb13eacf95f9a2c SHA512 b8b4390121780c4a562eaa563920a38637930a473e5b8e10fbb485c80c9a049825c73ff1c1786a869bc9603bb03d74b6d666064e6f98006edc5dba366c25f316 -DIST qtcharts-everywhere-src-6.5.0.tar.xz 4415456 BLAKE2B 405106453a2c40c57e7c5dc7981969e0a0b46865f946efc860c2775c845a857719308d8f6c7d6333e5d5dbcf0c7f45720a1386487a84929935ce276c2491293e SHA512 6b9b5081ae96af7fa122b6d9b59334d2bc69ebb44e91e544d39d62b570fa0cf763494162f7aa5c6960fbcd1197e856b19c2b278713e1d5e843e30fb25d9a2648 +DIST qtcharts-everywhere-src-6.5.1.tar.xz 4583760 BLAKE2B 5c9e13a54ae301930b11d96ea19aad327103c240de7763252434fda162b050b12f7439d550614596fa65daaa3063b6e657dd73d683fddcad59c7889ce6457828 SHA512 fe48ce2f4c3ba57f7ab23e7e5c02bdc303f1902ffa5b786e07d62b63b29551a0a3653764ca55c6b57b52f77b7a71795801e2fb942df1d8ccd03f594c92e6f94f EBUILD qtcharts-5.15.9.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2 -EBUILD qtcharts-6.5.0.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716 +EBUILD qtcharts-6.5.1.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30 diff --git a/dev-qt/qtcharts/qtcharts-6.5.0.ebuild b/dev-qt/qtcharts/qtcharts-6.5.1.ebuild index 92c6cf414b07..92c6cf414b07 100644 --- a/dev-qt/qtcharts/qtcharts-6.5.0.ebuild +++ b/dev-qt/qtcharts/qtcharts-6.5.1.ebuild diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 648f84e45dee..4ba3646af8f3 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,7 +1,7 @@ AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3 DIST qtdeclarative-5.15.9-gentoo-kde-1.tar.xz 21808 BLAKE2B fdf3205fed515bb43e72424673def7d3e1e0a7374e20f9f403e906403bcb3febf2c0decee08241bdc7e634cc1771f2e5326d698ff81fa46b931780eda3ea34d8 SHA512 2fe0230de76ed87247b288fdc34ceb5ab459ad4607968f656a73f0d6e4e8c854f6538b7eb0199a432b44b0bcec443a2f21633b46991a27b733b61d66f7f24422 DIST qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz 21587820 BLAKE2B 530ff86b43ae0cbc427d0b35c64fc9cb7aad62536686486344ef6a224b609ab2eed72fe5aa761e8bcbd920cc5f4329e44cdffa87afa17b0847b57b6a2ffa4c3b SHA512 ada3e32f42270899d92c46f0c0b8cd78028cf2e658ac60b3745c804ec494fb1fc6f31a670668074433b3e702f81524415ef132a757ca80151eb13d0a19352af7 -DIST qtdeclarative-everywhere-src-6.5.0.tar.xz 32597512 BLAKE2B 294832bf6932a4cfa60d474a79acd23772a5f598add63adbdb639d6211430c72a75da7f8dd43e8cf43483ac43b611f0a87d28ec6a1e75b59f1165b153a1df19b SHA512 df31f08be3849b2775c1fbeb72f9922f7fa64b8b18b506e5ce309b718cfaeef9bb7225cb55610c8cf695f85e5fc0430461f1317b335358b4196b5e48242a7d00 +DIST qtdeclarative-everywhere-src-6.5.1.tar.xz 35506504 BLAKE2B 8748a3c29d2bb7888fdb275fe663c39bb9c23e2e8afddbfb2aef11b1b315083da70bb180e10c9474cda4c8df5396d47b0b45b6620618753a455bf68cdc06044a SHA512 7ec840e42b1042263aa41c5d339cfa8a7921e3c5f217e710df0737b2c5c44b1e6c0fae155af934087f5a623d9370f30f83ec5691eb473e52b46486f4938173c7 EBUILD qtdeclarative-5.15.9.ebuild 1537 BLAKE2B 7a4c8c240e26b70bd7a7e60e4268cfbcb3f9f2b88091abda6be1ac39a3728072928ea53d93c044eae7c6981a2ac2936fa6e0af9ebd498e8bbe2e39bdf361b3b8 SHA512 24a254cb03164d73de0b377980ca36b85f21475f7abbdd67afe683a9b39be7d0558af0b18c9d7e809ec01ebe443c185c77939064b1b3d94a7733955e694e24a7 -EBUILD qtdeclarative-6.5.0.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8 +EBUILD qtdeclarative-6.5.1.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8 MISC metadata.xml 744 BLAKE2B ef479ad28d7560fc3abd2e743e8994a6a843bc1a4d0644ac037a4fa481f71a6ee73fbf99073769d20fcb245e6432556bc00707d3ecec1fb709ae2622fc9c5e31 SHA512 27d3e595647800c62e1275f2b5bfae0f2644fce547175cd5f63c4907c2313298b988f5378761868d2761c3edf396cfcf4d0c733032026e7ea0a9bf7ba367ecda diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.1.ebuild index 8c9a771cc98e..8c9a771cc98e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.5.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.1.ebuild diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index dd8013211f8f..6cf458f530f7 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -1,6 +1,6 @@ DIST qtimageformats-5.15.9-gentoo-kde-1.tar.xz 6956 BLAKE2B 931db97a164533aa47174b84fc8d6f07c49941dabaf63193d5b82cda2e236edab390e4d2130372fddcfb20abdfc754cfd26fa07b42e10a268c23f549a3310299 SHA512 b0d19631d49d01acb16794001adb309bc5b6b1dcc80657c02d8eccd0d6bdd964b3f69c859a28aafd16777095bb4107dec22d89443efda197b5211cc7101f2bb1 DIST qtimageformats-everywhere-opensource-src-5.15.9.tar.xz 1844504 BLAKE2B 013554caa2441461656b8a2eb153ea2b09412fb5ccb04189fa05e7ae4ce787843053dca24e9982c7939a1c1e48237740f33a9df7d993eb312a9aaad0b01b980b SHA512 9713c781200c8abb1a6f1a2dfb851fc38dcb2428ca3dbf29aa392d938671978804a67587bbbc5a5f75703cc754da4673dd9a4b567c9c03ed61d329889156c437 -DIST qtimageformats-everywhere-src-6.5.0.tar.xz 1958056 BLAKE2B 96c8c4ce429068544c79a33083786363419675c6a5aec7a7b659a7e7a7ae74fb15c5e9a515478addc99c1a1b48c36b39161b5bd0d19c12d2fc14d9b577cb658b SHA512 2456f6e85baccc933f275e2d1f0e1ee75ef6816b811d52544345b208e19755d9a9ced5fd314d47744d894bd0395c0b9f9792b739d021f90fa67e7c3c08b9f751 +DIST qtimageformats-everywhere-src-6.5.1.tar.xz 1958432 BLAKE2B 6b7aadd9d8414ab2c767290c4964197230dd73aaa792763216538acc6323d39b4230dfe2c20a8b4988e93a64ed447c7a9bdc63168931c239ad23d266dce853b8 SHA512 41b82b829579d81e964212ecb6adf56a02fbe0293c33718c428977eb55df2008ea0af6214e051b5415fdfc828c532276be7b9cfb1523d8fc4dc07d4b337d49e3 EBUILD qtimageformats-5.15.9.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43 -EBUILD qtimageformats-6.5.0.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2 +EBUILD qtimageformats-6.5.1.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtimageformats/qtimageformats-6.5.0.ebuild b/dev-qt/qtimageformats/qtimageformats-6.5.1.ebuild index ffa831e51aa5..ffa831e51aa5 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.5.0.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-6.5.1.ebuild diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index 00c94701bc34..7c35ff145b49 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -1,7 +1,7 @@ DIST qtlocation-5.15.9-gentoo-kde-1.tar.xz 3968 BLAKE2B a36b202400894ea4b5f377381a5870e88022c5a20e1adec4515745bc2606b7f0180ff30435724218c0f1ef130cbf29f57a0c6c7f4f48b9b3689c7aa8bb2bfa73 SHA512 e043e0537ecb66372b9464fd2d49bc8d6297bb29e5ceddc171d3899fd42a57cf129782c85efab6d5d3bc7dc3db91ba623161f7369861e9a7b6623e557dd8834e DIST qtlocation-everywhere-opensource-src-5.15.9.tar.xz 6552244 BLAKE2B 5091aef5706313660dd6fe5d831d0a9b8b6160739c1cce115e6a42a0b2ff3020ff0cd51a99bff9d24ccd29952b259fd1953bd5691ae4c3b2cbb8f31d3e9107f8 SHA512 37517c304240921c600e2aad19baff0efbb5e01c5cc78e5370fb4b084f2a6ba4da94d39ddcbcd33a5f0af37f017d39bb775a40cda195e16697aa70c9d17b6bcf -DIST qtlocation-everywhere-src-6.5.0.tar.xz 3038252 BLAKE2B 5530b37669f29c8f616daf2028ce27b712352863299ccf77fcc5a89999e34ab8e3a00c60ba30ef01b1c4337a519261be8288f3c4be0da18a840d418381bcc1f2 SHA512 e0b0c8f4093436aa53661fbcea885ee86565ff8e61bae4b567be24e7251e56b77071b78e160903ddc487b36931ce6f1a525c74135cd360cdd1d189da4463a96d +DIST qtlocation-everywhere-src-6.5.1.tar.xz 3032784 BLAKE2B 78f2254e56d97dcbe380832dade72a0dc47a9f829764b6c4d584acf00b0b64f9ff37135b01fcc34a5efef8f9b5877c511395de69138030c47eb077f5d18346a0 SHA512 31190ca57feb4ed8b72d5bb5896a81da56632f873609470e760b390a3839f84bf8f6771c6acfcccec6781c694642b85ea34b0c7321528df5a0529af3d2bc5ad1 DIST qtlocation-mapboxgl-5.15.9-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb EBUILD qtlocation-5.15.9.ebuild 1648 BLAKE2B 3eef58b8008cca5aa3ef1d3e8149d8e55d498905f26bbc3d8d1f1b677fbced9b2b31b93ce9874a7f7acc9a4356146fe7d1b78b1d04ccb96f183f08ac879056d2 SHA512 e68ed2e2d6ccc2507334bb7749f484362cf654dd823cfcb6d85f1c3eda02572bcfddb3524f4c0806b9647b37e69252d783c5bd0d71016ef9428dfff7d4da8546 -EBUILD qtlocation-6.5.0.ebuild 364 BLAKE2B 587a510063f71296820a8eda326353e37e2a69e3b90e85912ee22f65e20bc7f3310caa493ba310d6972885d3fef215aa89d5fce62fb85543d7aeb26bde2e6a8d SHA512 d55455aaa1208c488463806c8a0444c88521aa43ab5bc2715bc4c3cc366e9d3f3953d5f8d0c92b3dac36b82584484ad82335825c17f4e65f0e7265881e601dcc +EBUILD qtlocation-6.5.1.ebuild 364 BLAKE2B 587a510063f71296820a8eda326353e37e2a69e3b90e85912ee22f65e20bc7f3310caa493ba310d6972885d3fef215aa89d5fce62fb85543d7aeb26bde2e6a8d SHA512 d55455aaa1208c488463806c8a0444c88521aa43ab5bc2715bc4c3cc366e9d3f3953d5f8d0c92b3dac36b82584484ad82335825c17f4e65f0e7265881e601dcc MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtlocation/qtlocation-6.5.0.ebuild b/dev-qt/qtlocation/qtlocation-6.5.1.ebuild index cd6b3e19feb4..cd6b3e19feb4 100644 --- a/dev-qt/qtlocation/qtlocation-6.5.0.ebuild +++ b/dev-qt/qtlocation/qtlocation-6.5.1.ebuild diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 910727a50671..aca45a7d5250 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,6 +1,6 @@ DIST qtmultimedia-5.15.9-gentoo-kde-1.tar.xz 2428 BLAKE2B a6dc23222583f309acad524a5f13c9552e0f621b72090b589fd5ec81bfe0be26347e0aa3606e08d68691d77c3fd22a571b556ef73b710763655ef1cf356f4983 SHA512 c403bca7a1f809b207476241d0576b50bfddb8152263f673e44c1a4a2d518b998c470635d26b53461197cf5d57e365c1d6497babd28f99c4d5470af71927b3c2 DIST qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz 3831184 BLAKE2B de436efbb5ad8228514e96bf59d65fcbc1afa5b07e6bc5df8eb9a7859c2b1e97b83c23cc0566961faafc6774e40dcdee0cbb21cbbb40ea570458d1b166e05fc1 SHA512 f167e7910c19a55858a4b8e53c293908ef50e8a299b5dc6a346c2c877b4f65aa6da17807ec3f297530515b4558c74e97d54d6013c27400c1c4964c7c4dbef6cd -DIST qtmultimedia-everywhere-src-6.5.0.tar.xz 6042164 BLAKE2B b1126411a816da38c206edc36b8d3a5f3e24db389b30aefdfdccb516faf60547e6bc19d773930d7ddc4c678978b71217781abb429113a54800a0640dd3787ea7 SHA512 fe0dd9a534d30fa47129c4dbefb789ce1fc5b3d2a59b7583c986262a26a0638e2147edc77cf7c484af9c01acce9aaccaaa4a406c12bde324555790a956859341 +DIST qtmultimedia-everywhere-src-6.5.1.tar.xz 6290204 BLAKE2B 3ae21e2d0c50c4d8d99e3d0e2a15405a04c1f0f2d8bef204975185828aada27008a8b03756652b4700afe1b189e391e113c11e2283a39200652a211dc4e0c39b SHA512 2085d223869b627a2e5590a08081eb23ca34f8122c6492867db4596d5414e9c3eeca9338cf1745638ee60f0c559cbaa73aaab14c40785accf60a0d7e177fb937 EBUILD qtmultimedia-5.15.9.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21 -EBUILD qtmultimedia-6.5.0.ebuild 772 BLAKE2B 992e1c2af7e095cefcfa4d5be13479b0921246582787b3adf2e69afd113f2da43c67cb97c2aa4ed848f1587389d58e6e3b08114c4310a10a180ddb838e6fe598 SHA512 aaf6d58763fb8892f54885dc9e83d7c524b41a3a71a0a06d7a01a4e5a7f0791cb8be1ad5de490e4b0d4c391b3a05d265dd9f9e93dc32d68eb94293a71b8c24b5 +EBUILD qtmultimedia-6.5.1.ebuild 1166 BLAKE2B 0a5e0010a3d074ff025caa1ad35de114b3aeb3d0fbce4be4d505d15edcb3798ac9fee75dc4e3fa6676cb701b226b8f8748c4db4389ec5673f38c26095a8f9c69 SHA512 5297008856ee527c5967c03fa9af31409deb5099e80f81bb4dd7be1810cb081fdde81775750c3e171bc4e0081a03b50af37c9196a177cf26be4e82c3cc15d0e1 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.1.ebuild index 07b0a8706fd5..d8aa0ed4a6d2 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.5.0.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.1.ebuild @@ -5,19 +5,30 @@ EAPI=8 inherit qt6-build -DESCRIPTION="Qt Multimedia" +DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="gstreamer" +IUSE="alsa +ffmpeg gstreamer pulseaudio v4l" + +REQUIRED_USE="|| ( ffmpeg gstreamer )" RDEPEND=" =dev-qt/qtbase-${PV}*[gui,network,widgets] =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtquick3d-${PV}* =dev-qt/qtshadertools-${PV}* =dev-qt/qtsvg-${PV}* + alsa? ( media-libs/alsa-lib ) + ffmpeg? ( + media-libs/libva:= + media-video/ffmpeg:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 @@ -25,17 +36,20 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 media-libs/libglvnd ) + pulseaudio? ( media-libs/libpulse[glib] ) " DEPEND="${RDEPEND} gstreamer? ( x11-base/xorg-proto ) + v4l? ( sys-kernel/linux-headers ) " src_configure() { - # TODO: linux_v4l automagic local mycmakeargs=( - -DQT_FEATURE_alsa=off - -DQT_FEATURE_pulseaudio=off + $(qt_feature alsa) + $(qt_feature ffmpeg) $(qt_feature gstreamer) + $(qt_feature v4l linux_v4l) + $(qt_feature pulseaudio) ) qt6-build_src_configure diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index d074af33fad5..94ad23cbc95e 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,9 +1,11 @@ AUX qtnetwork-5.15.9-CVE-2023-32762.patch 1598 BLAKE2B 2d7a37066205b9eb75df0783d49bb36b71e7fe5ee65a391b9d5578c283c6058bec951b9587b27ca63b658254f9c540e54460ea2c4f6a8503fb25da31e8c6d969 SHA512 f89d96bb473e38fc069c8d0afa9c7339647af30948f40de6fc432f55e0d23ba01d0a1ef29145213afd6dbae6992a436baa693dcace982fd0a906d7118e73ad14 +AUX qtnetwork-5.15.9-CVE-2023-34410.patch 5162 BLAKE2B d4d268edeecd71972985f52a8f0aa34df9ad5a08e89176d3f368d37d13e889bb71093e7b70f2e32e7ce765fabb4c4b71bf6c7e1cb01d4daffd720070718e2fc9 SHA512 dfad275afee27020588769c71618a930e8e4836bffb2fa9b24a18fdb9724d26715ea5bcab8f9ea6d4484f8bec21fd06664111e37663fbbd5d177665e1a51bc7b AUX qtnetwork-5.15.9-QDnsLookup-dont-overflow-the-buffer.patch 4180 BLAKE2B b85be10b7274322b10eb4ab654aa83621655a495be641dd7d66ebdfc10749fe2aeb333f02b8fa4703e48eefec56e8657375c921320a22e601c9117fe605782e2 SHA512 f6ea5c46c252a3781de1364878692e76950b68f48e51cf042565cb7da0632310e7b85abe52054bb4571638645c2affa6ab20374c6b7c5beaa0b441b85a34956c AUX qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch 982 BLAKE2B d473b6c4d3b8b06c6682ca4c9bcd9dd26040a3f41dbd06ae0776509c12a5be04b65cd682aa27e1c286061e7cfc05abdb3fae59fd9ab28ca7a5d73bdea3bf5963 SHA512 3db59e9de4d5405f6fe85105d8add6ca18a5b868eb24ba355073c7e27183f2fe51baafc269bef628b6a8c820be7d66984cef742f43181ef4cf26a3284ba1e318 DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3 EBUILD qtnetwork-5.15.9-r2.ebuild 1771 BLAKE2B f4f979099e47e355ccfae3074652019678e1a96ea0d69432c5b2d387d3e6b6558eff3694fdc955d1b63fe68e05d822e366357d73f1a142bc9f3fad3801244ddb SHA512 4d9178f57bbb24b204bac584af37ea2d3c6fd9296ba0e685e54ef9a8df153138c57ca6c5e0fd08ae9f9fbee8d5505cadfe6e9f7b99c1071a6f8afba390c04fc6 +EBUILD qtnetwork-5.15.9-r3.ebuild 1813 BLAKE2B 512e960cb5f65727e2c7de6b9e3bd151a72e71cc0f8b9c339a58c31a4a828cec2995f3cf206b4352004e31d49457fe120e85dfa9a2832f1bbea85ad427bf1cff SHA512 1cf46c222b8724838c28829905aed765a9906c9247aa842e710f906f33fb76df173bc456db38ee38ab36ee10b4bc0053783a8e644736c77f9eca387511ce2295 EBUILD qtnetwork-5.15.9.ebuild 1601 BLAKE2B 9cf47cc0adb7c85a2538161f2281e6e8dd4160b6aee2bc245e5837c1367a348478e17bca059d7d131b95ff6559c40ffb9641e72edce61134734637bd19471c33 SHA512 47873673446842b0afbbf0837ecd00aa8d7cd4d7cce5c095923a22a28fc8a419ec933b5e189b68b0be38b67b2677293d809ba26fa8a5b447c4f574129cacae7d MISC metadata.xml 877 BLAKE2B eefc4aa477bcc6ffb2a2fb0711861a9bd7c79af5c5febe0205da57a3fae7206f3ae96dffb8b57e15dfe2f1e26891691886e02984654556d3d53a269dde5ce757 SHA512 dad0239dceb378c1ad4f52c287fb5d61cc248ac533a3df3673b30c0f332eb5cd3a34255052afe2a42084bf1c1d6a1ee501723e43eb268ab5e215fb37f90bcf36 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-34410.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-34410.patch new file mode 100644 index 000000000000..3c9145256328 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-34410.patch @@ -0,0 +1,113 @@ +From 51a3c8d7b8140f0bf6912d14a58bcd0092b868a1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> +Date: Wed, 10 May 2023 16:43:41 +0200 +Subject: [PATCH 1/2] Schannel: Reject certificate not signed by a configured + CA certificate + +Not entirely clear why, but when building the certificate chain for a +peer the system certificate store is searched for root certificates. +General expectation is that after calling +`sslConfiguration.setCaCertificates()` the system certificates will +not be taken into consideration. + +To work around this behavior, we do a manual check that the root of the +chain is part of the configured CA certificates. + +Pick-to: 6.5 6.2 5.15 +Change-Id: I03666a4d9b0eac39ae97e150b4743120611a11b3 +Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> +Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> +(cherry picked from commit ada2c573c1a25f8d96577734968fe317ddfa292a) +--- + src/network/ssl/qsslsocket_schannel.cpp | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp +index c956ce3c2b..d1b23af29b 100644 +--- a/src/network/ssl/qsslsocket_schannel.cpp ++++ b/src/network/ssl/qsslsocket_schannel.cpp +@@ -1880,6 +1880,28 @@ bool QSslSocketBackendPrivate::verifyCertContext(CERT_CONTEXT *certContext) + if (configuration.peerVerifyDepth > 0 && DWORD(configuration.peerVerifyDepth) < verifyDepth) + verifyDepth = DWORD(configuration.peerVerifyDepth); + ++ const auto &caCertificates = q->sslConfiguration().caCertificates(); ++ ++ if (!rootCertOnDemandLoadingAllowed() ++ && !(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN) ++ && (q->peerVerifyMode() == QSslSocket::VerifyPeer ++ || (isClient && q->peerVerifyMode() == QSslSocket::AutoVerifyPeer))) { ++ // When verifying a peer Windows "helpfully" builds a chain that ++ // may include roots from the system store. But we don't want that if ++ // the user has set their own CA certificates. ++ // Since Windows claims this is not a partial chain the root is included ++ // and we have to check that it is one of our configured CAs. ++ CERT_CHAIN_ELEMENT *element = chain->rgpElement[chain->cElement - 1]; ++ QSslCertificate certificate = getCertificateFromChainElement(element); ++ if (!caCertificates.contains(certificate)) { ++ auto error = QSslError(QSslError::CertificateUntrusted, certificate); ++ sslErrors += error; ++ emit q->peerVerifyError(error); ++ if (q->state() != QAbstractSocket::ConnectedState) ++ return false; ++ } ++ } ++ + for (DWORD i = 0; i < verifyDepth; i++) { + CERT_CHAIN_ELEMENT *element = chain->rgpElement[i]; + QSslCertificate certificate = getCertificateFromChainElement(element); +-- +2.41.0 + + +From a933f89e1f69b97ccb9d1e5f82d9a619c02afcd2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> +Date: Thu, 25 May 2023 14:40:29 +0200 +Subject: [PATCH 2/2] Ssl: Copy the on-demand cert loading bool from default + config + +Otherwise individual sockets will still load system certificates when +a chain doesn't match against the configured CA certificates. +That's not intended behavior, since specifically setting the CA +certificates means you don't want the system certificates to be used. + +Follow-up to/amends ada2c573c1a25f8d96577734968fe317ddfa292a + +This is potentially a breaking change because now, if you ever add a +CA to the default config, it will disable loading system certificates +on demand for all sockets. And the only way to re-enable it is to +create a null-QSslConfiguration and set it as the new default. + +Pick-to: 6.5 6.2 5.15 +Change-Id: Ic3b2ab125c0cdd58ad654af1cb36173960ce2d1e +Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> +(cherry picked from commit 57ba6260c0801055b7188fdaa1818b940590f5f1) +--- + src/network/ssl/qsslsocket.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp +index 5bb6e7ee4a..2a0b3a4f1d 100644 +--- a/src/network/ssl/qsslsocket.cpp ++++ b/src/network/ssl/qsslsocket.cpp +@@ -2221,6 +2221,10 @@ QSslSocketPrivate::QSslSocketPrivate() + , flushTriggered(false) + { + QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration); ++ // If the global configuration doesn't allow root certificates to be loaded ++ // on demand then we have to disable it for this socket as well. ++ if (!configuration.allowRootCertOnDemandLoading) ++ allowRootCertOnDemandLoading = false; + } + + /*! +@@ -2470,6 +2474,7 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri + ptr->sessionProtocol = global->sessionProtocol; + ptr->ciphers = global->ciphers; + ptr->caCertificates = global->caCertificates; ++ ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading; + ptr->protocol = global->protocol; + ptr->peerVerifyMode = global->peerVerifyMode; + ptr->peerVerifyDepth = global->peerVerifyDepth; +-- +2.41.0 + diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9-r3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9-r3.ebuild new file mode 100644 index 000000000000..5415787d1d2d --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.9-r3.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="connman gssapi libproxy networkmanager sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + connman? ( =dev-qt/qtdbus-${QT5_PV}* ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +PATCHES=( + "${FILESDIR}/${P}-QDnsLookup-dont-overflow-the-buffer.patch" + "${FILESDIR}/${P}-CVE-2023-32762.patch" + "${FILESDIR}/${P}-libproxy-0.5-pkgconfig.patch" + "${FILESDIR}/${P}-CVE-2023-34410.patch" +) + +QT5_TARGET_SUBDIRS=( + src/network + src/plugins/bearer/generic +) + +QT5_GENTOO_CONFIG=( + libproxy:libproxy: + ssl::SSL + ssl::OPENSSL + ssl:openssl-linked:LINKED_OPENSSL +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :network +) + +pkg_setup() { + use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) + use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) +} + +src_configure() { + local myconf=( + $(usev connman -dbus-linked) + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(usev networkmanager -dbus-linked) + $(qt_use sctp) + $(usev ssl -openssl-linked) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +} diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest index 749d3153ff65..d0466402d11a 100644 --- a/dev-qt/qtnetworkauth/Manifest +++ b/dev-qt/qtnetworkauth/Manifest @@ -1,5 +1,5 @@ DIST qtnetworkauth-everywhere-opensource-src-5.15.9.tar.xz 143792 BLAKE2B 0d977ef6dace8958bfe976262b9de5709a3819ac56fd29e26fe4bfd87a2b89e5a0860042c897798e657cf9a3ceb6bb42ae742021b07902105b4a4e4ba33df312 SHA512 9857f0e368e0c2bb4dfa772653a17cd34754e95ae64414f70ca78c1ec3a38ac850c462db9aa5fee4ee9143cd2fe0a5485fc0948cc3459a4842e221ab08356356 -DIST qtnetworkauth-everywhere-src-6.5.0.tar.xz 149868 BLAKE2B 1e7e6bc940b2e2b8ed8004f1a6e32f42a52dc9444e085494a94a09183d52fe26ba18c2feba97ba40762aed7ced999700de3413f050de38fd970f251cdb32ec25 SHA512 bf18b3a677306ff4d3dd0e9f579f36a14f6b8b51134c45c2e0cd1988c453b5ca52dd0cda9189f6f41050e6d6ea1fe27872099db5af0d3616de7751e4f25c34c0 +DIST qtnetworkauth-everywhere-src-6.5.1.tar.xz 150892 BLAKE2B 1654de2db82102845d845592d78e3690bc4d3eb9d7d9c80a7d34ee47e69a003f8450d78e6a580517a066d90add4a6f846db3e3ee5e666e9bb5cc3ecc208be4ac SHA512 04ddad0dd13ccef59790d9f0db394752076b0663a76c049a0a987e4841b5ad72fa053cbbb998cae9120481f683c5a488bb0b980fc3f6801b83078ac423a7079d EBUILD qtnetworkauth-5.15.9.ebuild 402 BLAKE2B f6aada3fab2a9a22353930bcc8c96fd46806ccc46792a9bf770a812245a9b246722101f40c0ac9a8b3fe115a94f38c4d32e988cd23f0f28133ea08e858b95414 SHA512 63a5ddf86500089e2f7fa44ebb585a11bf257222a9a9b96fa8985b5acb56301a8680f04ec0ee4cee0bd9dcd3761031da704f71bd18dfe7c88aeb9fcc308d222b -EBUILD qtnetworkauth-6.5.0.ebuild 337 BLAKE2B b9d2380c3f88cd04c9ae3c64e799fe978be6d05d6debd960d31018aca0bf67fd7831b17bbb4ed9a917477817b2eb011bbd9141e6b8f4d649179019146de03105 SHA512 11f4aa6fb4fdb30132c344e9fbab81006cba7cc8cf8b5c81339c837940f928a3752ad05d367500811f87f3a606ee432b717cce1dfdf801e6c293e112158cc514 +EBUILD qtnetworkauth-6.5.1.ebuild 337 BLAKE2B b9d2380c3f88cd04c9ae3c64e799fe978be6d05d6debd960d31018aca0bf67fd7831b17bbb4ed9a917477817b2eb011bbd9141e6b8f4d649179019146de03105 SHA512 11f4aa6fb4fdb30132c344e9fbab81006cba7cc8cf8b5c81339c837940f928a3752ad05d367500811f87f3a606ee432b717cce1dfdf801e6c293e112158cc514 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.0.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.1.ebuild index 90c313132402..90c313132402 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.0.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.1.ebuild diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest index f552978f8d2c..2c52f52b9c78 100644 --- a/dev-qt/qtpositioning/Manifest +++ b/dev-qt/qtpositioning/Manifest @@ -1,5 +1,5 @@ DIST qtlocation-everywhere-opensource-src-5.15.9.tar.xz 6552244 BLAKE2B 5091aef5706313660dd6fe5d831d0a9b8b6160739c1cce115e6a42a0b2ff3020ff0cd51a99bff9d24ccd29952b259fd1953bd5691ae4c3b2cbb8f31d3e9107f8 SHA512 37517c304240921c600e2aad19baff0efbb5e01c5cc78e5370fb4b084f2a6ba4da94d39ddcbcd33a5f0af37f017d39bb775a40cda195e16697aa70c9d17b6bcf -DIST qtpositioning-everywhere-src-6.5.0.tar.xz 1454336 BLAKE2B b56bae8b2ecd8d4409996dd31ebc4ef471eaf1462469c38f700a16c5ae132ca2bfbb92d9904af3b11359ab02a21a8abe72f9ebe5cab07c9af8472027c7fd34dc SHA512 c4ba9c6a1b73eb5db74eb405d2a5814e18309ad353536116bbf9042aa58d31607683593d797b78e662bb246941baa61f1856357b1a6c2fc1bf0a7bcf18fe921e +DIST qtpositioning-everywhere-src-6.5.1.tar.xz 1455492 BLAKE2B cab4f2f7d08a72ef5de8e3bc668b5949df3bb2a3f200bbe5382b49a21f1e8cc6855b4d8fc51881d56babe3c5212bfabc56f8670832f581e9d900e506b4b8f3d6 SHA512 67006663299b14a85a4a7cab2a03ec39f3b938c0f2f09520e3869509bedd24a2053e6f964bcca4d02df71c21d184b253f46cf1dd59e9da5c22cefbd1910ca305 EBUILD qtpositioning-5.15.9.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6 -EBUILD qtpositioning-6.5.0.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148 +EBUILD qtpositioning-6.5.1.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148 MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10 diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.0.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.1.ebuild index 60873b452acc..60873b452acc 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.5.0.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-6.5.1.ebuild diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest index 914deed28961..e37b838c79e9 100644 --- a/dev-qt/qtquick3d/Manifest +++ b/dev-qt/qtquick3d/Manifest @@ -1,3 +1,3 @@ -DIST qtquick3d-everywhere-src-6.5.0.tar.xz 59794136 BLAKE2B c9e08f2ea8b4e37d87b6c711be857aa9436b0f490e893984edfe02a6acffe692bf6d4f5f4f671d3e9d998d7e620cb94db1b9f3de8b5573aaf7ced3847edb1781 SHA512 84e5e7015596c035a74f94ec2c6ea254c820b7c4bdc730ec487642108eb6e948867aae1033314a7a4cf0fc37db673537008ec1a44079594acd76ecbaf475c467 -EBUILD qtquick3d-6.5.0.ebuild 667 BLAKE2B 0cafb500af3c6ee81e35aa86ee82a2d891a4e5537382858d998c865dec646721f698176d523371e4bdbe124dc684900ec08d6a786e0822ca72a3aebecd2bfac6 SHA512 27467129bed7575cdaf45ec48087cce9bc4c5915fc12164dbe710d8096735083ae8fdd671ca184c163194f95dc6c91264fc66623ee1e43ab83dc9e866fe50139 +DIST qtquick3d-everywhere-src-6.5.1.tar.xz 59685252 BLAKE2B 96b47efee68a21602a861017dd99c2ada50ff66728cb3940b2d432f6d46d2afc12064e9370f79df1fd2760cc4ba5329e9305ed88a192376daddc33e9330a426c SHA512 a06ac092d923e103ca2902f363a1a47c7696ba3b356f61473d8b461ef3663aad80c8fbc8a22efd04def76ce2a7b7a3a16b7be5a9f9f58f198b18ee27d2f913e8 +EBUILD qtquick3d-6.5.1.ebuild 667 BLAKE2B 0cafb500af3c6ee81e35aa86ee82a2d891a4e5537382858d998c865dec646721f698176d523371e4bdbe124dc684900ec08d6a786e0822ca72a3aebecd2bfac6 SHA512 27467129bed7575cdaf45ec48087cce9bc4c5915fc12164dbe710d8096735083ae8fdd671ca184c163194f95dc6c91264fc66623ee1e43ab83dc9e866fe50139 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.0.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.1.ebuild index 92a82e63dc8d..92a82e63dc8d 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.5.0.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.5.1.ebuild diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest index da0b98ff478f..8212b32ed19b 100644 --- a/dev-qt/qtquicktimeline/Manifest +++ b/dev-qt/qtquicktimeline/Manifest @@ -1,5 +1,5 @@ DIST qtquicktimeline-everywhere-opensource-src-5.15.9.tar.xz 104724 BLAKE2B 9a5421cbfe3f8c2070c33f1829d325be97dd51644c2028e9e1b982abf4e5f3bb746766014481e60a9545b78ee13e6ea687d5d87c784fb49be4f654db53bec48a SHA512 a365c38e09c347a2fceff45a22c7bbe8c3cff5e1a3533ff4a89a71934275132ee21c4adf10120f8da50d907c81388d1290b1b16db3b3b0d8d761851888cd991b -DIST qtquicktimeline-everywhere-src-6.5.0.tar.xz 112812 BLAKE2B 0da75745c1549565e1c9fb751752adf245ed32f01a1e233781d68173153b684bb58b1547d29c618e722745d7538d0789c66d10a359a64c5303005a12110db9cf SHA512 80e1a979f86f68a817d5138a3e3033a3934123e72dad58bfad6383430ab24a7f1010e76cd41e549f00baeca6be76f2f17bff6b39855d0e5c47b003c59e5b1d55 +DIST qtquicktimeline-everywhere-src-6.5.1.tar.xz 113720 BLAKE2B f93083656fc52931e34619605efb37be8c0dbb65a30c8d23a9c41ac948842773570c5251ed135ddad0b42b6d2252e6dfa13e1985b5efbeb684c38e3ae73b3bd1 SHA512 72fa2c96beabf2ad734bf458f5a41edb7178bcf9c53184425ac33e75d648bd617ebc393a4036226846e3ca407fa17fca7bb15a23b7c75f12796353deddb962fc EBUILD qtquicktimeline-5.15.9.ebuild 367 BLAKE2B 610cca42b4a262f7b3c1d9943187d179af7ba673232108dfd154d5c355af691f445f5eb39261ca5bd25d4788318beff0f58cb6042a4433a45d5e9d2108b30f75 SHA512 231e521de5b8274c074de45306b7f8a72085e7d4f10a7f9e6decf4d358fc82b991cb01c0163aaa96bc54b56ad0f7d2c0c2e71c24f51baea9c95809d0c40c3efa -EBUILD qtquicktimeline-6.5.0.ebuild 349 BLAKE2B 87abc1b15b3f35c9aaa0422bf73321342981ff72d9e2eac71746fb12488a9740f472306a9dc1e7ef04624df47d169a15baee90c66a537432055c1a220e1d2b38 SHA512 40bcd48c890001940463e12a49eff06f600a5dddfe039518b142ce83ccef86d01a2421af8beda249c7c81cc4c9845b6f00e8cdf2a4e74abbec91f25556928504 +EBUILD qtquicktimeline-6.5.1.ebuild 349 BLAKE2B 87abc1b15b3f35c9aaa0422bf73321342981ff72d9e2eac71746fb12488a9740f472306a9dc1e7ef04624df47d169a15baee90c66a537432055c1a220e1d2b38 SHA512 40bcd48c890001940463e12a49eff06f600a5dddfe039518b142ce83ccef86d01a2421af8beda249c7c81cc4c9845b6f00e8cdf2a4e74abbec91f25556928504 MISC metadata.xml 383 BLAKE2B 8f734db19973b4ebfe57cf9417f7fbf6db00ca254cf2410e336c2f252aff7e85500d5fdb944e511a48bf08ebb3ee74e729073f567b9d7558efb19024f7c1e10e SHA512 c0c9a947c7ab5edce2487560d6d9c215966ba5804e370557f2d2a35d67bc6c1ac8a04afdaac8c733cc66be0977835826ecd817248b83c01f4230f8824fbc41a1 diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.0.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.1.ebuild index 3b0370aab04e..3b0370aab04e 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.0.ebuild +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.1.ebuild diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest index 2f85dfaa92df..250e54945ff0 100644 --- a/dev-qt/qtscxml/Manifest +++ b/dev-qt/qtscxml/Manifest @@ -1,5 +1,5 @@ DIST qtscxml-everywhere-opensource-src-5.15.9.tar.xz 436620 BLAKE2B 4471906e193e71c2cf16165a6925f2fa802d057afcb2690b0e9558c4fa98445282660346364800357e37f1146e077a3b10043fba3bd934bee34d8b801c74214e SHA512 f6c6bdcb651055fd3a9b18fae1860f0d72afe83a08b387cb1393d0b1966eaaf1d8ce4530e6faa3a4e4a18d97a8e36937303b99e29d7dba17b6bcda61a5eb9872 -DIST qtscxml-everywhere-src-6.5.0.tar.xz 1254984 BLAKE2B c004f2bb8961c2d8678497363920b7be82917b9b178334db90ef4ec386d498f7bbc4976018f0dbf35f76f7b7b5aea972b785f51bf60d91d29b5c7585dc18171e SHA512 21933952c5eecce2cfe45c8c7b50d249b71f49538ee6736a7180534abd44b6032ea9e4d2aa9b658b78f60ffd61cd065046da6df5abed13483237e8d8dcd9fe56 +DIST qtscxml-everywhere-src-6.5.1.tar.xz 1164020 BLAKE2B c0d5dc1f98cca202923343085097ba0d81ce3b4f0706254792f8e6f60709796f7dad0db9352aaf5d5f9283d5e231d3b927bdc9317d9b7130a19c194efed0bc6a SHA512 5be0c7fc913880500e360860a9b1f50dc868b4e4b02c6e774578221754a88ece44d90d80ea85aa74b23cc3790a20f1e2b00b7d395612143d42e7c63708ed9dd7 EBUILD qtscxml-5.15.9.ebuild 398 BLAKE2B 27b0f98657fad702cb2b14ad1c69bc80b9c42e5680ed3ba2db0e79bb9884c0f7e4960c3c4bea26a6e5577476030b52c172f327cb6b6ecd9ec72ec6b5d306725d SHA512 62f3dd6a55d8f8dc8af4d1e0f7ded88f8efd3fe1ada7a7f585bdd488c3599f160a9efbc52a014cb5016e11a13856dfabbc236cb4257bae8bbb18137bc02e22ce -EBUILD qtscxml-6.5.0.ebuild 363 BLAKE2B 63eaadf7515683df2e44c46e3c3d2f34e3a85e795fb9b7997efd6d4829f1dc3cd97c57ce60fef6d6421d63bfc366790294a41567941c5ab17354269d5638f78d SHA512 d55d3feb63a6a46bead229318fc996d2f30a66b7d27c0207e9fca53402cd6c72816ee5e94e21e9f39f4404f2b4accab9b38c90e938278a8b21f6334222b40f38 +EBUILD qtscxml-6.5.1.ebuild 397 BLAKE2B a479e813b27792c70211b5a8c20f473a0dc2517fce50394e233f78de410ee0c42dfb1bf6b4ba966d680516ef3777a2f3859a310d5c121c8a25d8b44c8a9aef30 SHA512 f52bb5c201d5d24944cec6a7385ce8fc5290e6f78f6d13fa652222678295d48ae5fbd24b8222f5add4ccab195b8902fbbbbe53bbf71be56a1f1b76b5ba98dc12 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtscxml/qtscxml-6.5.0.ebuild b/dev-qt/qtscxml/qtscxml-6.5.1.ebuild index 1016e87c11b7..2fedc64db025 100644 --- a/dev-qt/qtscxml/qtscxml-6.5.0.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.5.1.ebuild @@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi +IUSE="" + DEPEND=" - =dev-qt/qtbase-${PV}* + =dev-qt/qtbase-${PV}*[gui,network,opengl,widgets] =dev-qt/qtdeclarative-${PV}* " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest index a0771a823126..d11a1c48e611 100644 --- a/dev-qt/qtserialport/Manifest +++ b/dev-qt/qtserialport/Manifest @@ -1,5 +1,5 @@ DIST qtserialport-everywhere-opensource-src-5.15.9.tar.xz 323496 BLAKE2B e471854a2aac5143f7b6aa5ad452ed5c38dc7e021decee920b71fcc9f9b574af89a89c166a737e604f6778024cceb822acc19b82ab1ea07cb34d687b7d0280a6 SHA512 e22d20a0b20d0dc8c6bce3dcf1137b2cce28e370df9d0250f2a777dd73153d0156b0c6cfe88bc4257cdc209fbf640c8a06fada147d40ee638deb716148812da3 -DIST qtserialport-everywhere-src-6.5.0.tar.xz 278816 BLAKE2B 2c7eb8ccba32f88db419e6d870fff73290bdbb4aaaa55d4fb916d4d373d81499dd6aa2dab1d0f4bc621e575301b7b8f5213ed339f6c03fc93c5eab152158da1e SHA512 6d20025bedcd4f049f99efc775380d1d3578daa59e8f008961fa0e5c495d57992265917fad5471b917f60a4eb4e72491184e1281021320aed94cbedde22f2d71 +DIST qtserialport-everywhere-src-6.5.1.tar.xz 279664 BLAKE2B 5c3990cd08a40cd7db5fb81eaba7b0344c5fe8efc373007510cd241cdebb2d92044a97c3dfebf267b17f7b3d7f1f7ff17e2333d994735cea499d46000f6ae9d0 SHA512 2a85f98d6eca51896a8e32bb531326c8479fde8d09ef2936ba1acb2bbfcf565ccdbffde29fee3b685709b8e1aa3a77437515607f280b483937c417dd15d55793 EBUILD qtserialport-5.15.9.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df -EBUILD qtserialport-6.5.0.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39 +EBUILD qtserialport-6.5.1.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtserialport/qtserialport-6.5.0.ebuild b/dev-qt/qtserialport/qtserialport-6.5.1.ebuild index bf569254cd0a..bf569254cd0a 100644 --- a/dev-qt/qtserialport/qtserialport-6.5.0.ebuild +++ b/dev-qt/qtserialport/qtserialport-6.5.1.ebuild diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest index 668ba926d2b9..a3373ecee20f 100644 --- a/dev-qt/qtshadertools/Manifest +++ b/dev-qt/qtshadertools/Manifest @@ -1,3 +1,3 @@ -DIST qtshadertools-everywhere-src-6.5.0.tar.xz 1060464 BLAKE2B c3bdb87d932fd76de22f0e1c2fcead7e77efe23108e9e26d7446efd9f8efd9c03988f26216c572d4fe1d19e6c98ef4b310bf784c7870322f6fdcd3f57c5e030c SHA512 da62ec1ea4d20f91d83cfbbfc3cc25feb87051a1c2af58fd50afe4ee42b2fce9bb645e59291beb5893ec5dc7c0cb9d1defea0e90d7023c175e30c34dac13cdc5 -EBUILD qtshadertools-6.5.0.ebuild 314 BLAKE2B 315c0b8587baa11c5617ba89725807911c0a85e7b25bfd9bf4b6b6a0fd3b463acd9dcc623473a4bed6fd3af1380e8843483390d59469ad37c9a497be579947d7 SHA512 ac316a5580819aebd7b94e2ed7d97baaeb2d054faa0d6d0c21b65bc5b2eeb90feb0a8a9fa66a92e6dd275dbb5e153f7728a930fbeca2d1abe3d17d210e74254c +DIST qtshadertools-everywhere-src-6.5.1.tar.xz 1061792 BLAKE2B 02e2f3259c2e70b71c227420ab7ac3367bf91d1c64dec960b60af4ffe185e09efa6062bf20bb730e0812fa9be630c770a3e71bc53f686a1f03ffa253577a0343 SHA512 547c5e0c6220c6200f440ed1d6f3373423fceea09de8d1dc81c5d49f7e24beee6d460341828d74844a2e1af1181c702d93247dd95b273a0b1e110dcdcab69557 +EBUILD qtshadertools-6.5.1.ebuild 314 BLAKE2B 315c0b8587baa11c5617ba89725807911c0a85e7b25bfd9bf4b6b6a0fd3b463acd9dcc623473a4bed6fd3af1380e8843483390d59469ad37c9a497be579947d7 SHA512 ac316a5580819aebd7b94e2ed7d97baaeb2d054faa0d6d0c21b65bc5b2eeb90feb0a8a9fa66a92e6dd275dbb5e153f7728a930fbeca2d1abe3d17d210e74254c MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtshadertools/qtshadertools-6.5.0.ebuild b/dev-qt/qtshadertools/qtshadertools-6.5.1.ebuild index 88a20ffbb689..88a20ffbb689 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.5.0.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.5.1.ebuild diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index d74a500cc44d..a42fc58453e4 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,7 +1,7 @@ AUX qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch 1907 BLAKE2B 1d28a94ba450d74a3b990beada37abc9310fcdc6eb61f978101daf1c5093d98fdd58f00aaa28447f5b6f0d2fbd903d619a57f86474a05183f12bb5192c0e4d90 SHA512 ea6b2a0d1a1f54ee1f6a756a0a271047b32d674945787b0ed5245f6b4aafd3bcf560daf269225db2a62842ccf3b2f4c9b65b0af0a7787c6cc451d75606707736 DIST qtsvg-5.15.9-gentoo-kde-1.tar.xz 4368 BLAKE2B d2758227d565d9043022e22d0eaa34cdd4b851435e331c30af8c4b2b232a068d5bd222389588dd01ab872611d34da0be90f4921377de63e7b5477c0d74bb5090 SHA512 2b99a16e277795431ea7953119efe70a9bcf084b2cd1e63003d4ba032067eeaaacac47239788a5860c1d5960af738df7bda4a317b484f3f64e1cd1e3aa31b749 DIST qtsvg-everywhere-opensource-src-5.15.9.tar.xz 1889044 BLAKE2B 0163c88701d510ab99a1d0d91f98fced612e428fdb04573aba5e819cb7a713d283e1cae94f0e31a7016d14a1f61f202a417453f63768ebdfa185772abcf0cf71 SHA512 e091c059492662fad713d1f99bfa5e21a8f8e77e24b067d176a6e732b420a22e3777fa99a880c6f992a19b2e5b16c01f131da875d9e08e6a515108b468192fe5 -DIST qtsvg-everywhere-src-6.5.0.tar.xz 1727556 BLAKE2B 275442f9a00b65d51789e52ec13e9bb61825c8ce55a2262a78e110fc225a3f8622d3436d580d4e89db99db93884b60d8201d032823032de6311caa41a767b200 SHA512 ef317b9b3621b5554df20bc570b67392f9c0ab37929b4c9dc0e9902c1b63763aff5d9bdf50b50f7c0a3c9f74c513a53553744dda68d8d29f593fc70f787f1009 +DIST qtsvg-everywhere-src-6.5.1.tar.xz 1728900 BLAKE2B 9003463afefb97fea05dcac2b9a56f31c3e5a64a76e4a3b4b04bccfe73c691f48a4c8696aeda7359d113c6fd7c8ec7c0bc094d092f3db2338e0ca136792b7705 SHA512 4df0e02aa9b21091eb71a536befc52d8e7bd5f6d9fa757fcf0ac2f11e44d3f84b44d73551e44bd6a1045891bc9c0ed471820a94b8f014b3a82cccf32b10ac437 EBUILD qtsvg-5.15.9-r1.ebuild 555 BLAKE2B a77052e1952834d345fe99c7a9d426e8a3379ed06eaef40984b7098415b2f248e3954fadc3aa8975346d5b6e0447d3b4df5b0b073b97d59da172f55c61dda67e SHA512 430c41c0c2ace6c30a98e6abada3ca7ab3d11a5d453542f87c9941e2d9f126ebb64fe0ff6eb49005e9114879e7bdb8d6711f7276152012b9deb5c2e27d1de7d4 -EBUILD qtsvg-6.5.0.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe +EBUILD qtsvg-6.5.1.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtsvg/qtsvg-6.5.0.ebuild b/dev-qt/qtsvg/qtsvg-6.5.1.ebuild index 960a981395e2..960a981395e2 100644 --- a/dev-qt/qtsvg/qtsvg-6.5.0.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.5.1.ebuild diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index bf0d94e26db1..274dd1ca9038 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -1,3 +1,3 @@ -DIST qttools-everywhere-src-6.5.0.tar.xz 8588520 BLAKE2B 5f0016c59d4281eaa03b605356c5c40ea4b0a72ed4a72c276c7b2d825a9cd5e364981d03ade406e353ff56094f7459b2a76829c320200b071c1ba29e67e796e7 SHA512 fea7a2d6e4b8fde8696122f212d9ba4bf8ae878e7392232a07aadc1f6e77667cabeb8c091f676f997b215f8870c9a4aeb72420dd95d09513222c49f7048af7dd -EBUILD qttools-6.5.0.ebuild 1813 BLAKE2B c6d451c11e08829ac924812276d9827303d35f28c8482c5e264700c74146dba9100019ce423262855ff5a7ad40eda0deb427f4098d035e11e21a8202ac3eec4b SHA512 38cdebe2703aff3c9ba43ef874fc9efb7370ecc0cfe0eccb8b94c14c01570e1352ee01b27e66138e03e2074739ad72edda3a74934cc69f0165518dfe7a0ed727 -MISC metadata.xml 1094 BLAKE2B 0d4a81302d083669c9a2fe16e1bb7d11d2c421037eb90fa052a77db35b304f51d0d7c85d18c90527a7a546dcb0fbe72d318a26cacfc2c738967553f4e953f12f SHA512 02e76ec2ffca69115e904129f77aca35bbd9c33058636d969175c7c4e738eba61c5bceb2901ca6d3b8e6a6868f4de85b968dedd6513f2e938594574a2f4633ce +DIST qttools-everywhere-src-6.5.1.tar.xz 8592428 BLAKE2B 39a8eef639d4dea838b177285af175983e1e626cd82df8b2201b9380c4f62d5ec3560a7096b6f26a48886989be05bda453e487462d9e200577f15c9cb93eb26a SHA512 fa29a29bf9a723f88aaa5654e333daee90d8dc2f5c88653018a5e754c8115eec3c55940897817e0321dd4c9470d6d008e921ab7e20a714028fa38d04753bfb20 +EBUILD qttools-6.5.1.ebuild 1846 BLAKE2B 6b5787882cb6684fbb3f09c90de1ce9782d3d010ce3ce762f75439fb207d1bde9af9fd6d3a44c081626d12cdab6daf8d8dad7d8cb7d4abbaa8a601337222f60b SHA512 27d05449276f44ea507d3791432bf36c5530846184d98363f7bfa63888781957f6e73bead5c9b4df95891a4855cafc82fce68fa71b74d5f633053519b670e822 +MISC metadata.xml 1091 BLAKE2B b10645f2835b9c5163745ff656e5b2a25277f5d1de7de4c294161f85f7eae51a7bf55367215bc9c183eb6700ec12a3f1fe51cad98211c98a2f51df2efc972ae2 SHA512 93d7528b809549f111b61cef09176d62a25b6e67668cdb9cda8d099464496b5ed63eddaa81efed222d7f0afec287d75056a117d6379fe7af61f463ac85e33c1e diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml index b86ca58bee58..7664b3e6cd03 100644 --- a/dev-qt/qttools/metadata.xml +++ b/dev-qt/qttools/metadata.xml @@ -11,11 +11,11 @@ <flag name="distancefieldgenerator">Build Qt Distance Field Generator</flag> <flag name="linguist">Build Qt Linguist</flag> <flag name="pixeltool">Build Qt Pixeltool</flag> + <flag name="qattributionsscanner">Build Qt Source Code Attribution Scanner</flag> <flag name="qdbus">Build the Qt D-Bus Interface and D-Bus Viewer</flag> <flag name="qdoc">Build Qt Documentation Generator</flag> - <flag name="qtattributionsscanner">Build Qt Source Code Attribution Scanner</flag> - <flag name="qtdiag">Build Qt Diag</flag> - <flag name="qtplugininfo">Build Qt Plugin Info</flag> + <flag name="qdiag">Build Qt Diag</flag> + <flag name="qplugininfo">Build Qt Plugin Info</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qttools/qttools-6.5.0.ebuild b/dev-qt/qttools/qttools-6.5.1.ebuild index 197390961888..e75eadff55af 100644 --- a/dev-qt/qttools/qttools-6.5.0.ebuild +++ b/dev-qt/qttools/qttools-6.5.1.ebuild @@ -13,7 +13,7 @@ fi IUSE=" assistant designer distancefieldgenerator +linguist pixeltool - qdbus qdoc qtattributionsscanner qtdiag qtplugininfo + qattributionsscanner qdbus qdoc qdiag qplugininfo " DEPEND=" @@ -27,7 +27,7 @@ DEPEND=" pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] ) qdbus? ( =dev-qt/qtbase-${PV}*[widgets] ) qdoc? ( sys-devel/clang:= ) - qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] ) + qdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] ) " RDEPEND="${DEPEND}" @@ -39,11 +39,11 @@ src_configure() { $(qt_feature distancefieldgenerator) $(qt_feature linguist) $(qt_feature pixeltool) + $(qt_feature qattributionsscanner qtattributionsscanner) $(qt_feature qdbus) $(qt_feature qdoc clang) - $(qt_feature qtattributionsscanner) - $(qt_feature qtdiag) - $(qt_feature qtplugininfo) + $(qt_feature qdiag qtdiag) + $(qt_feature qplugininfo qtplugininfo) -DQT_FEATURE_thread=ON ) @@ -61,6 +61,6 @@ src_install() { use qdbus && qt6_symlink_binary_to_path qdbus 6 use qdbus && qt6_symlink_binary_to_path qdbusviewer 6 use qdoc && qt6_symlink_binary_to_path qdoc 6 - use qtdiag && qt6_symlink_binary_to_path qtdiag 6 - use qtplugininfo && qt6_symlink_binary_to_path qtplugininfo 6 + use qdiag && qt6_symlink_binary_to_path qtdiag 6 + use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6 } diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 606e6cd2442b..27e6729f6acd 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,7 +1,7 @@ AUX qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch 1451 BLAKE2B 63b053f96f4added309a96d33caea1f361087511cb82249864b4a9971794739903e4df1c240c0a42f71295bb0b4f0f48338e6fcadfe9549372d2b581cb2464b6 SHA512 9be539b99cba04e3009a4a61eb5890708f8cafb09161e2d11868bb3a687591d6d4758a13c469ca22b89380cf1a1950d844c25212ead7b64f45ac275db464a051 DIST qtwayland-5.15.9-gentoo-kde-1.tar.xz 44312 BLAKE2B be255e0d292ce6555473d4ad92b656ea0f3bd7c0d4041f92e2ccfe1e456c984ff3d9307e3ff1ebe8da5d40b6a6c938e116856ff1c392171f3157cc734461e8a7 SHA512 bf099acf0cb21c3402f38dcec8a3b2f9411e8d307e303bb2eb772e5dc5872cbdb456a7d37628d72bcf4f258f3e8f9baa53081bf5c061d6338f7431f016c0e27b DIST qtwayland-everywhere-opensource-src-5.15.9.tar.xz 567564 BLAKE2B c5a0d39cdd746e2aa6cd011ce04baa7f1f30e21c935877a684f07d5c2a0d3446e80569fa33c3fa0953b1bea86aefd64f80fda5164f3ee5648b74c2e0e8d369b9 SHA512 d108d63ceeb3b1a8905ad7f53a7271fca6a3506679d352b7290cdf8c00e1c180b6c561ee013a674002b89e23f58cfb7b909dfc5a8fdec6cece7e0a782be77978 -DIST qtwayland-everywhere-src-6.5.0.tar.xz 1058628 BLAKE2B 57bc21809e00e53c9c1bc2f3b536154adbb73f2dbd09aaf2aa92bf950e67160a740e572467f3831c4b4af9d4a1f3f6c89e64fbe5e3482f826025d488c8399e9e SHA512 d0a9b3cb5f93b99b20eca98512ebc8b6b8453df822e2aad7cd38169cd22ab1661ac0fc14223679174e8dbeaa63c2f3013287fef1b8ef620aa23ff6abbb6b730e +DIST qtwayland-everywhere-src-6.5.1.tar.xz 1059936 BLAKE2B 5b54804df8106b0585fa44612c3d688b89aaea7bd49f2420e2a44472ced9ed51c2aba1d0baf2e4636a58937e7393e6d4b1ad8c7d937dfbf96e5a90bba5393cca SHA512 9074adfb5ea9cc18896dade6706ef5a863033130f23aa11e0a7b2ae6e4df2fb64b636815e2489debb1032919a8ad20d39813d40b3ba7a87cebd801c9fae0d4f0 EBUILD qtwayland-5.15.9.ebuild 1098 BLAKE2B 32cb659241ca8c1a1ff731cddc0dc654b4fd6b1c42aa8038a8a37410da2b23a1893da1b49b1f7a21ab85769262bff739ab9df5ed19109f9e5456c2a52a577eb2 SHA512 def9ac79924d3359448ee55bf2bd2187236361b3bda8f4f27018079b6d3771b4a55deba28529e1776359228132571932a1f8eb34a2ea20f9ff27269f08a55724 -EBUILD qtwayland-6.5.0.ebuild 438 BLAKE2B b419dc79923c1f81cf59b47d3f95cf43372260430cd16593089229011756c78663d062ce5b23464df27753427257bcea89ed745c0f8f0a4a1b7e7328dad60441 SHA512 a6d1cd0314a2dbcd74e3a4cc3ba2cba7b4145331c0b7617fe387cbeea4d9cb0643ab20d897df6953a21274771d3e64a6e99dce79bf41d33383508fb7b037c32e +EBUILD qtwayland-6.5.1.ebuild 438 BLAKE2B b419dc79923c1f81cf59b47d3f95cf43372260430cd16593089229011756c78663d062ce5b23464df27753427257bcea89ed745c0f8f0a4a1b7e7328dad60441 SHA512 a6d1cd0314a2dbcd74e3a4cc3ba2cba7b4145331c0b7617fe387cbeea4d9cb0643ab20d897df6953a21274771d3e64a6e99dce79bf41d33383508fb7b037c32e MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2 diff --git a/dev-qt/qtwayland/qtwayland-6.5.0.ebuild b/dev-qt/qtwayland/qtwayland-6.5.1.ebuild index b1250c60de99..b1250c60de99 100644 --- a/dev-qt/qtwayland/qtwayland-6.5.0.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.5.1.ebuild diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest index ea1a8e0eee60..54ffe2fb2d87 100644 --- a/dev-qt/qtwebchannel/Manifest +++ b/dev-qt/qtwebchannel/Manifest @@ -1,6 +1,6 @@ DIST qtwebchannel-5.15.9-gentoo-kde-1.tar.xz 5804 BLAKE2B 9ac76ebfedc653130c19b5057394b97ee2427d8b3b7b1fecd50141d884d59f353991e0674428a3291541e55e77c96361dabb32d0186adaeb2ff6667829db74e9 SHA512 ffe6a5e2ca7f7a2f7757ec08fadb1ee0a213c18f700926e7627a89645ba988452e78e50de33e663106bc0c7cbff19763d298e68619187d942fee4637bf9b0ffa DIST qtwebchannel-everywhere-opensource-src-5.15.9.tar.xz 211032 BLAKE2B ea8f4c5900d7258fc365fa85b9a6477e717a631ea89e0ce3386820331db24345f2deab74e868c233f30a8a21fe9d82e6573be16a3eb3332d9852f0e6ae2860f2 SHA512 6b9c38c3d22708a14402282d4134475336cce2874887ece00316866cbc59714e395924cc9a449653ab050431c4ece5e0eb454ce2f4c13252bae7abd8fae93bb4 -DIST qtwebchannel-everywhere-src-6.5.0.tar.xz 213524 BLAKE2B abf90eb2b8106dc822e942e9c3964d89914b599994bd2f7f4332c479974451f77b6bdc13b3125f868edb79b9291146cf954cdb7bd7f0db217169afa491eebe2e SHA512 146bf4b190a5d9af36f17cff9340df8faa2465ccb47fec767157d4c47a9ff4554bd3917d6694da1ee6914e34ac3793b6c99673712b12b65b1f3e9f59e274933f +DIST qtwebchannel-everywhere-src-6.5.1.tar.xz 214404 BLAKE2B 37785146f6590dfde2b3af112b46025a6b5639554bcaf0302a9cad35cc2df28efc03ec91252eb9a01b20c0628f1d1637908f686b089f4b3f08d03ab8190b186f SHA512 a61a22b84f10f1ca5272e87de501f1c75f15a8f9a0aa5ff18d4df74a60bb8bec589289164863b6539cff4796c7c19a5ba126027e41107fccc43cf7523def1b0c EBUILD qtwebchannel-5.15.9.ebuild 599 BLAKE2B c61043201e33bea4827e7726a31ef0f631bba2799aaf76f9aa849d58f2b958e9053a6d73438906c92ef5ff160cf69cf568692ba566fa55d513154c7fbb385a31 SHA512 62b65e38d50d9d337a4e6979ff758211350f720c4b7072d02213133a88e017f8996f69aabd0a22a495c0c86b5e6c19a4117f771ce1f58877413fcd57613e4dc8 -EBUILD qtwebchannel-6.5.0.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9 +EBUILD qtwebchannel-6.5.1.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30 diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.0.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.1.ebuild index e82c78f55aca..e82c78f55aca 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.5.0.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.1.ebuild diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 65142b91fd1b..f82ed5330084 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,11 +1,10 @@ AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da -AUX qtwebengine-6.5.0-gcc-13-build.patch 17896 BLAKE2B b8aaecb917e3375027ec0a7feffe0842c2e393c597362ef01317ae05744baa837942d9021aaa152505a46af325add61d22d3218b8a32b1b5a80e539d3b88ff5b SHA512 fa7ff29cee454741916b83732b86738e10925c62826e3f5db18c6becd99d27b2523622bd787706df876c0df7fd3b385c59e7e7133bc0e393a4e323a3a0cd1e11 -AUX qtwebengine-6.5.0-userscripts-loading.patch 3711 BLAKE2B 6ad83d8db818f9b5e4a9212b60e3e042b260059cf29bf95a2ee221383bcc7bc14e7ac7f4d55d0f73a80cdd797b94b0930a0d461e7aea8139018f60784e286139 SHA512 c6ebf4a4d33dfc82cab60551e20d6c607baf4c773c80fc9649af92bed10af3209f77db5b6864339db1211aae857ff53b46d8daae91823e8ab3c3408aea15f9e1 +AUX qtwebengine-6.5.1-normalise-clipboard-permissions.patch 5103 BLAKE2B b4929694e409a74a7ffafe3ae683cd2688385cd282c024ec08eab2fe484fb49816c8e4d3cffe201c5549846a3a42a1d65581dca21625de5ab5c606cee15002e4 SHA512 0280a9fccab1fe35d3c4e2de02af9ca24c1fc6dd3e98540990a8a4eb5b69a7f3289a8c1bd8347baa3ada9064105042f1b26484a6ed7b6ce483c379f796df213d DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec DIST qtwebengine-5.15.9_p20230505.tar.xz 298713240 BLAKE2B 835e93a0b33e7294d72571c9031524a0e3002100e36433501cc83bac91646b788c1030ee9ce90edce39c6ee2ee61a1d697e021b6346804d3be0f0b930e6084d0 SHA512 61d16399a7d8f5c135c5c097c2dcb7ebeccfe7e31769e950443ffa8178f55ad22d90307b7bd2b2ebdcb3ee0dd2064266159c27da4fc5b35ddac346ca9f336cc1 -DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 42aa5023462ee2db6ef24da1858873897ac5d6bd170adc389617525745708529578dcbcf694d1cadf3b591770f4e925ad24f61500cd13ef90236bda412797cb7 SHA512 02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0 +DIST qtwebengine-everywhere-src-6.5.1.tar.xz 412377436 BLAKE2B 1ff179daf1433246b931558f52f1cf193eff4a1d646e6f6037a40fe85fa28cf944b7f361fd68cb01b1247680d376762c2c5317be125f5b24cc08e4bbfa6f0def SHA512 68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428 EBUILD qtwebengine-5.15.9_p20230505.ebuild 8404 BLAKE2B 0b82f31c53c3391042014b1e0f953169b74bb83221958717f645b585815388ae945343aa153f44c9754c2e4160a113d994156cfec77a4c3d683fceaf074f3920 SHA512 83ef513c0d3afe9e216ca477a30a96db233a67b70ca0570e15587f96cf525b06877f7e40115019b367e8166742ec2c5d527a750afa1445a9549f44b4158b392f -EBUILD qtwebengine-6.5.0-r2.ebuild 7558 BLAKE2B 672b105ee7b36d4c327687d7fe44b24df085b0787a7477ec23387543830c0d83ba8833fb65c9a98bdca61111f636932bb412e69c3e09a151c38a9af5b80e6fbd SHA512 c7fa13dfbdd0d4c90d0ccc5285460e0368b54e90d66c276d12a5a929bf6de281b065692a27fee57c8c6d5e2d1ee049a94693ac8dd5e5623d047d1512dd14ef73 +EBUILD qtwebengine-6.5.1.ebuild 7523 BLAKE2B 13dcff549ee7cc6277ad70db8fbdd6afb775e4b31db5adeceaa8a9e8d0c338fbcbd0374dc3d13ae9d287b921407ec41c631f09a8ef8516f158f917762a4a3396 SHA512 a612a406e55a1709269b897ea320374b5e43d7f9207bf05652c3bc0ac2a173a92463cd78a3c1c7ce3c0de21fc4513402292752dbd912274a35373936a4beb91f MISC metadata.xml 1152 BLAKE2B 2975a3fabc6464a6207a6b1a9da943baa16bc9a3b77a987cffeb6ea7c8791c5d09171b74825e6f218612144d862de1f2865c60fb6c4c187a1c5f6940112117e9 SHA512 aa3ed598b19be8adceb5a9b90bbc5d5d2521aa1a742210f536d11cf0466204ac3dc373ccee5a9a6cf523827589d17022ca2b54c8e142e6bb3b2afcfc98fa242d diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch deleted file mode 100644 index 0993771177b4..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch +++ /dev/null @@ -1,394 +0,0 @@ -Upstream: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=108-based&id=9de0d8a90d9 - -From 9de0d8a90d9b0176542db8b54d678a9fcbb69337 Mon Sep 17 00:00:00 2001 -From: Martin Negyokru <negyokru@inf.u-szeged.hu> -Date: Fri, 3 Mar 2023 16:56:50 +0100 -Subject: Fixes for building with GCC-13 - -Pick-to: 102-based -Pick-to: 87-based -Fixes: QTBUG-111697 -Change-Id: I51fca3b3eb627b2617ff5c6c051fa1182671244d -Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/464490 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> ---- - chromium/base/debug/profiler.h | 1 + - chromium/cc/trees/target_property.cc | 2 ++ - chromium/components/metrics/psi_memory_parser.h | 2 ++ - chromium/components/viz/common/shared_element_resource_id.h | 1 + - chromium/content/public/browser/browsing_data_remover_delegate.h | 1 + - chromium/device/base/synchronization/one_writer_seqlock.h | 1 + - chromium/device/bluetooth/public/cpp/bluetooth_uuid.h | 1 + - chromium/extensions/common/constants.h | 2 ++ - chromium/extensions/renderer/bindings/api_invocation_errors.h | 1 + - chromium/gpu/config/gpu_feature_info.h | 1 + - chromium/net/base/parse_number.h | 2 ++ - chromium/net/cookies/cookie_inclusion_status.h | 1 + - .../net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h | 1 + - .../net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h | 1 + - chromium/pdf/document_attachment_info.h | 1 + - chromium/sandbox/linux/syscall_broker/broker_file_permission.h | 1 + - chromium/third_party/angle/include/GLSLANG/ShaderVars.h | 1 + - .../blink/public/common/bluetooth/web_bluetooth_device_id.h | 1 + - .../third_party/blink/public/common/interest_group/auction_config.h | 1 + - .../blink/public/common/origin_trials/origin_trial_public_key.h | 1 + - .../renderer/platform/graphics/paint/effect_paint_property_node.h | 2 +- - chromium/third_party/pdfium/constants/annotation_flags.h | 2 ++ - chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h | 1 + - chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h | 4 ++++ - chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h | 1 + - chromium/ui/base/prediction/kalman_filter.h | 2 ++ - chromium/ui/events/types/scroll_types.h | 2 ++ - chromium/ui/gfx/geometry/linear_gradient.h | 1 + - 28 files changed, 38 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h -index 5f0deadd5d3..80c73feb922 100644 ---- a/src/3rdparty/chromium/base/debug/profiler.h -+++ b/src/3rdparty/chromium/base/debug/profiler.h -@@ -6,6 +6,7 @@ - #define BASE_DEBUG_PROFILER_H_ - - #include <stddef.h> -+#include <cstdint> - - #include <string> - -diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc -index f6e873a01a1..714bd5efed1 100644 ---- a/src/3rdparty/chromium/cc/trees/target_property.cc -+++ b/src/3rdparty/chromium/cc/trees/target_property.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include <cstdint> -+ - #include "cc/trees/target_property.h" - - #include "ui/gfx/animation/keyframe/target_property.h" -diff --git a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h -index b8b22f4ab74..3d7ec9ca63a 100644 ---- a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h -+++ b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h -@@ -5,6 +5,8 @@ - #ifndef COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_ - #define COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_ - -+#include <cstdint> -+ - #include <string> - - #include "base/gtest_prod_util.h" -diff --git a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h -index b39a2d3dc18..ca3d8aedaef 100644 ---- a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h -+++ b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_ - #define COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_ - -+#include <cstdint> - #include <string> - #include <vector> - -diff --git a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -index ee75332f05f..c0168281e81 100644 ---- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -+++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -@@ -5,6 +5,7 @@ - #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ - #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ - -+#include <cstdint> - #include <string> - #include <vector> - #include "base/callback_forward.h" -diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h -index 528b6683ca2..e37a16b81be 100644 ---- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h -+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h -@@ -6,6 +6,7 @@ - #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_ - - #include <atomic> -+#include <cstdint> - #include <type_traits> - - #include "base/atomicops.h" -diff --git a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -index 816d3405eb0..15c4004c013 100644 ---- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -+++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -@@ -5,6 +5,7 @@ - #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ - #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ - -+#include <cstdint> - #include <ostream> - #include <string> - #include <vector> -diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h -index bf6bac2b47c..b1a0d56ea64 100644 ---- a/src/3rdparty/chromium/extensions/common/constants.h -+++ b/src/3rdparty/chromium/extensions/common/constants.h -@@ -5,6 +5,8 @@ - #ifndef EXTENSIONS_COMMON_CONSTANTS_H_ - #define EXTENSIONS_COMMON_CONSTANTS_H_ - -+#include <cstdint> -+ - #include "base/files/file_path.h" - #include "base/strings/string_piece_forward.h" - #include "build/chromeos_buildflags.h" -diff --git a/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h b/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h -index e21700ecfc4..3b704e83b06 100644 ---- a/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h -+++ b/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h -@@ -5,6 +5,7 @@ - #ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_ - #define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_ - -+#include <cstdint> - #include <set> - #include <string> - -diff --git a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -index 1a7028e4717..b9e951c0a4f 100644 ---- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -+++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -@@ -5,6 +5,7 @@ - #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_ - #define GPU_CONFIG_GPU_FEATURE_INFO_H_ - -+#include <cstdint> - #include <string> - #include <vector> - -diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h -index d6adf388e6f..ea360d1c927 100644 ---- a/src/3rdparty/chromium/net/base/parse_number.h -+++ b/src/3rdparty/chromium/net/base/parse_number.h -@@ -5,6 +5,8 @@ - #ifndef NET_BASE_PARSE_NUMBER_H_ - #define NET_BASE_PARSE_NUMBER_H_ - -+#include <cstdint> -+ - #include "base/strings/string_piece.h" - #include "net/base/net_export.h" - -diff --git a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -index 5f289ddcd94..44f2f9eb1ff 100644 ---- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -+++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -@@ -6,6 +6,7 @@ - #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ - - #include <bitset> -+#include <cstdint> - #include <ostream> - #include <string> - #include <vector> -diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h -index 6a300ed0c0b..3e30f1cb02f 100644 ---- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h -+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h -@@ -5,6 +5,7 @@ - #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_ - #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_ - -+#include <cstdint> - #include <vector> - - #include "absl/strings/string_view.h" -diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h -index 52f15017283..db4d3108497 100644 ---- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h -+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h -@@ -5,6 +5,7 @@ - #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_ - #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_ - -+#include <cstdint> - #include <string> - #include <vector> - -diff --git a/src/3rdparty/chromium/pdf/document_attachment_info.h b/src/3rdparty/chromium/pdf/document_attachment_info.h -index e0fffc2ca4e..095463fcb5b 100644 ---- a/src/3rdparty/chromium/pdf/document_attachment_info.h -+++ b/src/3rdparty/chromium/pdf/document_attachment_info.h -@@ -5,6 +5,7 @@ - #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_ - #define PDF_DOCUMENT_ATTACHMENT_INFO_H_ - -+#include <cstdint> - #include <string> - - -diff --git a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -index b167ffb099a..2347d546167 100644 ---- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -+++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -@@ -6,6 +6,7 @@ - #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_ - - #include <bitset> -+#include <cstdint> - #include <string> - - #include "sandbox/sandbox_export.h" -diff --git a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -index 4b76d33af2f..4db1902d1b7 100644 ---- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -+++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -@@ -12,6 +12,7 @@ - - #include <algorithm> - #include <array> -+#include <cstdint> - #include <string> - #include <vector> - -diff --git a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h -index 7a74887af96..058870eef35 100644 ---- a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h -+++ b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h -@@ -6,6 +6,7 @@ - #define THIRD_PARTY_BLINK_PUBLIC_COMMON_BLUETOOTH_WEB_BLUETOOTH_DEVICE_ID_H_ - - #include <array> -+#include <cstdint> - #include <string> - - #include "third_party/blink/public/common/common_export.h" -diff --git a/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h b/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h -index 5151ab7483f..51e7e1a58f0 100644 ---- a/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h -+++ b/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h -@@ -7,6 +7,7 @@ - - #include <stdint.h> - -+#include <cstdint> - #include <limits> - #include <string> - #include <vector> -diff --git a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h -index c1b5f59f57e..246200991a5 100644 ---- a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h -+++ b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h -@@ -6,6 +6,7 @@ - #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_ - - #include <array> -+#include <cstdint> - - namespace blink { - -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h -index e40a7620795..745b7b0891f 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h -@@ -122,7 +122,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode - - // An identifier for a document transition shared element. `id.valid()` - // returns true if this has been set, and false otherwise. -- DocumentTransitionSharedElementId document_transition_shared_element_id; -+ blink::DocumentTransitionSharedElementId document_transition_shared_element_id; - - // An identifier to tag shared element resources generated and cached in the - // Viz process. This generated resource can be used as content for other -diff --git a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -index d2731dac7a3..46bc87ef92a 100644 ---- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -+++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -@@ -5,6 +5,8 @@ - #ifndef CONSTANTS_ANNOTATION_FLAGS_H_ - #define CONSTANTS_ANNOTATION_FLAGS_H_ - -+#include <cstdint> -+ - namespace pdfium { - namespace annotation_flags { - -diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h -index 1b4c53815bc..472042fabc4 100644 ---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h -+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h -@@ -18,6 +18,7 @@ - #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ - - #include <array> -+#include <cstdint> - #include <string> - - #include "perfetto/ext/base/optional.h" -diff --git a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h -index b7c586b80eb..9e073d4e1b8 100644 ---- a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h -+++ b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h -@@ -2393,6 +2393,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock V - #include <cstring> - #include <utility> - -+#if VMA_STATS_STRING_ENABLED -+#include <cstdio> -+#endif // VMA_STATS_STRING_ENABLED -+ - #if VMA_RECORDING_ENABLED - #include <chrono> - #if defined(_WIN32) -diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -index 4190a79dc09..5a9285f0071 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -@@ -12,6 +12,7 @@ - #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - -+#include <cstdint> - #include <string> - #include <vector> - -diff --git a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h -index bee3f946e9c..f7c8716ca33 100644 ---- a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h -+++ b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h -@@ -5,6 +5,8 @@ - #ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_ - #define UI_BASE_PREDICTION_KALMAN_FILTER_H_ - -+#include <cstdint> -+ - #include "base/component_export.h" - #include "ui/gfx/geometry/matrix3_f.h" - -diff --git a/src/3rdparty/chromium/ui/events/types/scroll_types.h b/src/3rdparty/chromium/ui/events/types/scroll_types.h -index be6b2779f41..dbe2e5cf746 100644 ---- a/src/3rdparty/chromium/ui/events/types/scroll_types.h -+++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h -@@ -5,6 +5,8 @@ - #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_ - #define UI_EVENTS_TYPES_SCROLL_TYPES_H_ - -+#include <cstdint> -+ - namespace ui { - - enum class ScrollGranularity : uint8_t { -diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -index 65cd4cb07c7..ab0ce5808c3 100644 ---- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -+++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -@@ -6,6 +6,7 @@ - #define UI_GFX_LINEAR_GRADIENT_H_ - - #include <array> -+#include <cstdint> - #include <string> - - #include "ui/gfx/geometry/geometry_skia_export.h" --- -cgit v1.2.3 - diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch deleted file mode 100644 index 6a5802829bb4..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-userscripts-loading.patch +++ /dev/null @@ -1,112 +0,0 @@ -https://github.com/qutebrowser/qutebrowser/issues/7662 -https://bugreports.qt.io/browse/QTBUG-113109 - -https://codereview.qt-project.org/c/qt/qtwebengine/+/474114 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Mon, 24 Apr 2023 17:33:17 +0200 -Subject: [PATCH] Fix user script management when subframes are present - -Only the main frames should administer scripts associated with it. - -Pick-to: 6.5 -Fixes: QTBUG-113109 -Change-Id: Ibda66f55ef99da632134a9de1425797262faba9b ---- a/src/core/renderer/user_resource_controller.cpp -+++ b/src/core/renderer/user_resource_controller.cpp -@@ -289,10 +289,11 @@ - FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(renderFrame); - if (it == m_frameUserScriptMap.end()) // ASSERT maybe? - return; -- for (uint64_t id : std::as_const(it.value())) { -- m_scripts.remove(id); -+ if (renderFrame->IsMainFrame()) { -+ for (uint64_t id : std::as_const(it.value())) -+ m_scripts.remove(id); - } -- m_frameUserScriptMap.remove(renderFrame); -+ m_frameUserScriptMap.erase(it); - } - - void UserResourceController::addScriptForFrame(const QtWebEngineCore::UserScriptData &script, -@@ -304,7 +305,8 @@ - - if (!(*it).contains(script.scriptId)) - (*it).append(script.scriptId); -- m_scripts.insert(script.scriptId, script); -+ if (!frame || frame->IsMainFrame()) -+ m_scripts.insert(script.scriptId, script); - } - - void UserResourceController::removeScriptForFrame(const QtWebEngineCore::UserScriptData &script, -@@ -315,7 +317,8 @@ - return; - - (*it).removeOne(script.scriptId); -- m_scripts.remove(script.scriptId); -+ if (!frame || frame->IsMainFrame()) -+ m_scripts.remove(script.scriptId); - } - - void UserResourceController::clearScriptsForFrame(content::RenderFrame *frame) -@@ -323,8 +326,10 @@ - FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(frame); - if (it == m_frameUserScriptMap.end()) - return; -- for (uint64_t id : std::as_const(it.value())) -- m_scripts.remove(id); -+ if (!frame || frame->IsMainFrame()) { -+ for (uint64_t id : std::as_const(it.value())) -+ m_scripts.remove(id); -+ } - - m_frameUserScriptMap.remove(frame); - } ---- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp -+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp -@@ -76,6 +76,7 @@ - void scriptsInNestedIframes(); - void matchQrcUrl(); - void injectionOrder(); -+ void reloadWithSubframes(); - }; - - void tst_QWebEngineScript::domEditing() -@@ -694,6 +695,38 @@ - QTRY_COMPARE(page.log, expected); - } - -+void tst_QWebEngineScript::reloadWithSubframes() -+{ -+ class Page : public QWebEnginePage -+ { -+ public: -+ Page() : QWebEnginePage() {} -+ QVector<QString> log; -+ -+ protected: -+ void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel, const QString &message, int, -+ const QString &) override -+ { -+ log.append(message); -+ } -+ } page; -+ -+ QWebEngineScript s; -+ s.setInjectionPoint(QWebEngineScript::DocumentCreation); -+ s.setSourceCode(QStringLiteral("console.log('Hello');")); -+ page.scripts().insert(s); -+ -+ page.setHtml(QStringLiteral("<body>" -+ " <h1>Test scripts working on reload </h1>" -+ " <iframe src='about://blank'>" -+ " </iframe>" -+ "</body>")); -+ QTRY_COMPARE(page.log.size(), 1); -+ -+ page.triggerAction(QWebEnginePage::Reload); -+ QTRY_COMPARE(page.log.size(), 2); -+} -+ - QTEST_MAIN(tst_QWebEngineScript) - - #include "tst_qwebenginescript.moc" diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch new file mode 100644 index 000000000000..7caf202072c7 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch @@ -0,0 +1,99 @@ +Qt Upstream: https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=6.5&id=281174f5e010d819a49562b48b2c2067255a41c6 + +From 281174f5e010d819a49562b48b2c2067255a41c6 Mon Sep 17 00:00:00 2001 +From: Szabolcs David <davidsz@inf.u-szeged.hu> +Date: Fri, 19 May 2023 01:00:41 +0200 +Subject: Normalize clipboard permissions + +Handle clipboard read and write permissions the same way everywhere. + +Fixes: QTBUG-113579 +Change-Id: If1f271e8591c54f4ee2f935486502df19d5f6b3e +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +(cherry picked from commit 79e4a37668a9176373e81fe4fc8dfe29f6c8c37b) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +--- + src/core/permission_manager_qt.cpp | 46 +++++++++++++++++++------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp +index 9d98c0592..28e1c981d 100644 +--- a/src/core/permission_manager_qt.cpp ++++ b/src/core/permission_manager_qt.cpp +@@ -84,6 +84,22 @@ static blink::mojom::PermissionStatus toBlink(ProfileAdapter::PermissionState re + } + } + ++static blink::mojom::PermissionStatus getStatusFromSettings(blink::PermissionType type, WebEngineSettings *settings) ++{ ++ switch (type) { ++ case blink::PermissionType::CLIPBOARD_READ_WRITE: ++ if (!settings->testAttribute(QWebEngineSettings::JavascriptCanPaste)) ++ return blink::mojom::PermissionStatus::DENIED; ++ Q_FALLTHROUGH(); ++ case blink::PermissionType::CLIPBOARD_SANITIZED_WRITE: ++ if (!settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)) ++ return blink::mojom::PermissionStatus::DENIED; ++ return blink::mojom::PermissionStatus::GRANTED; ++ default: ++ return blink::mojom::PermissionStatus::ASK; ++ } ++} ++ + PermissionManagerQt::PermissionManagerQt() + : m_requestIdCount(0) + { +@@ -179,13 +195,8 @@ void PermissionManagerQt::RequestPermission(blink::PermissionType permission, + Q_ASSERT(contentsDelegate); + + ProfileAdapter::PermissionType permissionType = toQt(permission); +- if (permissionType == ProfileAdapter::ClipboardRead) { +- WebEngineSettings *settings = contentsDelegate->webEngineSettings(); +- if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard) +- && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste)) +- std::move(callback).Run(blink::mojom::PermissionStatus::GRANTED); +- else +- std::move(callback).Run(blink::mojom::PermissionStatus::DENIED); ++ if (permissionType == ProfileAdapter::ClipboardRead || permissionType == ProfileAdapter::ClipboardWrite) { ++ std::move(callback).Run(getStatusFromSettings(permission, contentsDelegate->webEngineSettings())); + return; + } else if (!canRequestPermissionFor(permissionType)) { + std::move(callback).Run(blink::mojom::PermissionStatus::DENIED); +@@ -220,14 +231,9 @@ void PermissionManagerQt::RequestPermissions(const std::vector<blink::Permission + const ProfileAdapter::PermissionType permissionType = toQt(permission); + if (permissionType == ProfileAdapter::UnsupportedPermission) + result.push_back(blink::mojom::PermissionStatus::DENIED); +- else if (permissionType == ProfileAdapter::ClipboardRead) { +- WebEngineSettings *settings = contentsDelegate->webEngineSettings(); +- if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard) +- && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste)) +- result.push_back(blink::mojom::PermissionStatus::GRANTED); +- else +- result.push_back(blink::mojom::PermissionStatus::DENIED); +- } else { ++ else if (permissionType == ProfileAdapter::ClipboardRead || permissionType == ProfileAdapter::ClipboardWrite) ++ result.push_back(getStatusFromSettings(permission, contentsDelegate->webEngineSettings())); ++ else { + answerable = false; + break; + } +@@ -280,14 +286,8 @@ blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForCurren + permission == blink::PermissionType::CLIPBOARD_SANITIZED_WRITE) { + WebContentsDelegateQt *delegate = static_cast<WebContentsDelegateQt *>( + content::WebContents::FromRenderFrameHost(render_frame_host)->GetDelegate()); +- if (!delegate->webEngineSettings()->testAttribute( +- QWebEngineSettings::JavascriptCanAccessClipboard)) +- return blink::mojom::PermissionStatus::DENIED; +- if (permission == blink::PermissionType::CLIPBOARD_READ_WRITE +- && !delegate->webEngineSettings()->testAttribute( +- QWebEngineSettings::JavascriptCanPaste)) +- return blink::mojom::PermissionStatus::DENIED; +- return blink::mojom::PermissionStatus::GRANTED; ++ Q_ASSERT(delegate); ++ return getStatusFromSettings(permission, delegate->webEngineSettings()); + } + + return GetPermissionStatus( +-- +cgit v1.2.3 + diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.0-r2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild index 912effe24979..93f241ac06e2 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.0-r2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" CHROMIUM_VER="108.0.5359.181" -CHROMIUM_PATCHES_VER="110.0.5481.104" +CHROMIUM_PATCHES_VER="112.0.5615.138" inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build @@ -87,10 +87,7 @@ DEPEND="${RDEPEND} media-libs/libglvnd " -PATCHES=( - "${FILESDIR}/${PN}-6.5.0-gcc-13-build.patch" - "${FILESDIR}/${PN}-6.5.0-userscripts-loading.patch" -) +PATCHES=( "${FILESDIR}/${PN}-6.5.1-normalise-clipboard-permissions.patch" ) python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" @@ -234,7 +231,7 @@ src_configure() { -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487 -DQT_FEATURE_webengine_system_icu=$(usex system-icu) -DQT_FEATURE_webengine_system_libevent=on - -DQT_FEATURE_webengine-system-libopenjpeg2=on + -DQT_FEATURE_webengine_system_libopenjpeg2=on -DQT_FEATURE_webengine_system_libpci=on -DQT_FEATURE_webengine_system_libpng=on -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off) diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest index 54daea65857b..af26217bf25a 100644 --- a/dev-qt/qtwebsockets/Manifest +++ b/dev-qt/qtwebsockets/Manifest @@ -1,6 +1,6 @@ DIST qtwebsockets-5.15.9-gentoo-kde-1.tar.xz 1516 BLAKE2B 6b05a02276d3e3d2c327c57fd77e1f72bf3d36cde31f09cc3e12355026eaea14479fa699e9669a08b065952700d1d27e810165adf6af9c7592e78522d34bb218 SHA512 e09426cf32714e68f531e4a3454ee85d3d4fd3ad47810053b9fea095c409a9b3682db060dde45709eed7316e36e416ecb78e45358a5549bc0544221d2b0ae829 DIST qtwebsockets-everywhere-opensource-src-5.15.9.tar.xz 260972 BLAKE2B e485977b89a8311610ecafd3da119d9e5a5570034ec6c41bb16b8c412c71633b4669ee10afbd67af666166727b9fbc578d0023e74a1fd6e35e8b92e96f277760 SHA512 3e9b63656c16893a67d62f452c70decfca160ab192b3da2f25f3f72e513a58e3ec678ad05e618d1e48c05708f55d38ca02d4b1f3efdbea5e544f5cec16f6a5ac -DIST qtwebsockets-everywhere-src-6.5.0.tar.xz 266852 BLAKE2B 1354a5c5d6cfe6b016c78541271e2327a73886205fad1124ace93bd8e60d0a07b1ac763205d0259e43db21dabe028c10140ce00f634c3d3054db8d3e4fb58cc9 SHA512 b13a6c385573cd19cefa48dfd6be1066c09b046f5a54d2c61fda3ab83903dc75b2f3fa0aa45f9e56610526214a64416f90d955becf2aff90611387a605314b67 +DIST qtwebsockets-everywhere-src-6.5.1.tar.xz 460056 BLAKE2B 66c7f0b545ab88fceb61a1ec1211d255dca77c7678f4fc65d83a8bedc1d2b4590aaf1f93370637e73102179051c22eb6c67881da67ffe65da72287800f4b88f4 SHA512 cd11d6b50e60c5246cd6469a0bf4ce75afd3ab57c8e082a71c25d5a0662e1a23276e232106dd3e8893ce60ca86cc2ab6c213433fbb194efdf1a9be4ae53f2b4d EBUILD qtwebsockets-5.15.9.ebuild 578 BLAKE2B c89a75bff2dc425ed95717e37c667136a5082535d19fd58b341e7da4b210224bf9142da7abbf24130abc4c4e36ee4e5f59eb32505c0be39cf22c8bbdaedd8261 SHA512 b5baa375f6484fd77203b7402fa3e1555a214e6cca44405b44eadf0e201e546026af97675dd01daf8513ddc6a575a4f30a4ed1ba23985cd200058e631d593369 -EBUILD qtwebsockets-6.5.0.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17 +EBUILD qtwebsockets-6.5.1.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1 diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.5.0.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.5.1.ebuild index abdcffa9a067..abdcffa9a067 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.5.0.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-6.5.1.ebuild |