gentoo auto-resync : 23:02:2023 - 21:45:48

5 files changed, 0 insertions, 113 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index f52d5dcaa59a..e3d208fc7ef2 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 5aa81ea7e655..2e634fd6d465 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,4 +1,3 @@
-AUX qttools-6.4.0-clang-15-build.patch 3466 BLAKE2B 627bb33b7b0e5a28b2a522023d18cf1275b9976ca4345c2b2c0fdf25388158d176225dd084e4b54164d79368075a199b5a00dcd936c53c55a798ce9a6400f1d5 SHA512 dd45e8827b9f0c9e725aa1ed411e5b5b8d4e626bc19afd86bab8a30c81f7d4c9430bbad3edf708e27aa4c73e2daadad9f3067095266596e7f9efecb7fb537adf
 DIST qttools-everywhere-src-6.4.2.tar.xz 8740276 BLAKE2B ea376587d3385afa620c917dbf06d3f9a8303f19388f001ae0e441ce392ae401f80893a788b3a4162575913046d922f7c9606cec85d6786860190c4b996ab201 SHA512 303da2e7d58d213b8a5d4f4e36c7903b57ea8011f711cfb598b79414a6da1e3cc5e47a26a34ff1bdf82e07cb4f5274bd45297b880c380e6a3de3df42837a2c2c
 EBUILD qttools-6.4.2.ebuild 1197 BLAKE2B 8f6b3572287e9eed612dc835e127564570938b956c8720d14ac123303684f4999cc6a0399c999d4769796fd0dd1dcedb915487bb802afcb9c2ec3cb3fb556d39 SHA512 f0c2896e185eccf8769fef78c9f789ea1636f162b8bef9f09296562baedf215dad326ec2ccf38996a8694e7b32cabfd765f695ef9d88c5d0c371ceda1c96df70
 MISC metadata.xml 1094 BLAKE2B 0d4a81302d083669c9a2fe16e1bb7d11d2c421037eb90fa052a77db35b304f51d0d7c85d18c90527a7a546dcb0fbe72d318a26cacfc2c738967553f4e953f12f SHA512 02e76ec2ffca69115e904129f77aca35bbd9c33058636d969175c7c4e738eba61c5bceb2901ca6d3b8e6a6868f4de85b968dedd6513f2e938594574a2f4633ce
diff --git a/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch b/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch
deleted file mode 100644
index eb2d8027cc09..000000000000
--- a/dev-qt/qttools/files/qttools-6.4.0-clang-15-build.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Gentoo Bug: https://bugs.gentoo.org/873640
-Qt Bug: https://bugreports.qt.io/browse/QTBUG-106224
-Patch: https://codereview.qt-project.org/c/qt/qttools/+/436135
-
-From 6495329e6de803025e6e4e8291b648f94893551c Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de>
-Date: Sat, 1 Oct 2022 07:19:52 +0200
-Subject: [PATCH] lupdate: Fix build with clang 15+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-The signature of InclusionDirective changed for clang 15.
-
-Pick-to: 6.4
-Change-Id: Ic259b3508088671b40f6f615524137ce8837c487
-Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
----
- src/linguist/lupdate/lupdatepreprocessoraction.cpp | 13 +++++++++++--
- src/linguist/lupdate/lupdatepreprocessoraction.h   |  7 ++++++-
- 2 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
-index abfab34e5c..d963747d8e 100644
---- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
-+++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
-@@ -156,14 +156,23 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange,
- // To list the included files
- void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/,
-     const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/,
--    clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file,
-+    clang::CharSourceRange /*filenameRange*/,
-+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
-+    const clang::Optional<clang::FileEntryRef> file,
-+#else
-+    const clang::FileEntry *file,
-+#endif
-     clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/,
-     const clang::Module */*imported*/, clang::SrcMgr::CharacteristicKind /*fileType*/)
- {
-     if (!file)
-         return;
- 
--    clang::StringRef fileNameRealPath = file->tryGetRealPathName();
-+    clang::StringRef fileNameRealPath = file->
-+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
-+        getFileEntry().
-+#endif
-+        tryGetRealPathName();
-     if (!LupdatePrivate::isFileSignificant(fileNameRealPath.str()))
-         return;
- 
-diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h
-index b1ee468d4e..3e44cee839 100644
---- a/src/linguist/lupdate/lupdatepreprocessoraction.h
-+++ b/src/linguist/lupdate/lupdatepreprocessoraction.h
-@@ -51,7 +51,12 @@ private:
-     void SourceRangeSkipped(clang::SourceRange sourceRange, clang::SourceLocation endifLoc) override;
-     void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/,
-                             clang::StringRef /*fileName*/, bool /*isAngled*/,
--                            clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file,
-+                            clang::CharSourceRange /*filenameRange*/,
-+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
-+                            const clang::Optional<clang::FileEntryRef> file,
-+#else
-+                            const clang::FileEntry *file,
-+#endif
-                             clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/,
-                             const clang::Module */*imported*/,
-                             clang::SrcMgr::CharacteristicKind /*fileType*/) override;
--- 
-2.16.3
-
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ca7e27bbc5f1..275147542ac7 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -10,7 +10,6 @@ AUX qtwebengine-5.15.3_p20220406-gcc12-includes.patch 1139 BLAKE2B ba451fcef0dd2
 AUX qtwebengine-5.15.3_p20220505-extra-gn.patch 458 BLAKE2B 0595f06d31fd83a04cc0ef9fb7567374c28c4d09c8774e6584d288aa18c2386efe699bd1d155fdee96f5960d3575baff6a6aa7a694d0c953401f80add9daf6c3 SHA512 81498f04c1ad4d73e888bba31fb1129e24990bcddb1d68111b004bba2e4fdab91698b3fe1d01bd94a0bf904e52f614cddc4ba6f70ffaf6a1d45e37a53e583629
 AUX qtwebengine-5.15.8_p20230106-v8-opcode-constexpr.patch 1911 BLAKE2B fb59f9ae06031bd52460856951653e193ee9a2d6f965fe0aab940822d8a7a90aea830ba9548a5879ac8644b5b80fb1ffbaf14dfb91de44e07c2ef4f5c470db6d SHA512 c490c2650f061e584523b06d28b3986a2ba940a478fa0aff1f1f4891495423c5dd432cc96a690ad02871e8e626d77978aaa9b97b4a8d0122e0638849e4225b3c
 AUX qtwebengine-5.15.8_p20230106-widevine.patch 4482 BLAKE2B 25cb06e27d51011df57b63053bc97f20bf0062167d0915b2d4da5b5b7164b5f35ef66b19da69acd3fac16bf9264e85e5d69987a6c38284033c77058b9146ea20 SHA512 f05969ce3355ca23cdaad822e052f4a12350598cd9a5bf5af72f9f10e1cf43bbbc86f2af3b5e27cd6a9198bd025a7afddb4db35444542d57c9963f3f47a6de97
-AUX qtwebengine-6.4.0-no-websocket-intercept.patch 1582 BLAKE2B ca612dfe68ea051bec1a0af75806326a152fde8ece5449ceefd706eaa83911396ad4d2fc7633d53d6b54b17501a25a59928a34c82fdd88c6de4a3c7d110b1ec5 SHA512 bfaaa8f294a21390b45eafb5fabd933021208056d032169c6388a5d9f96991971c01adbb61d9293afd830114f671440f645ce2d53fe9596f390bce806cadc003
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch b/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch
deleted file mode 100644
index 941c39c0a5a9..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Qt Bug: https://bugreports.qt.io/browse/QTBUG-107144
-Gerrit: https://codereview.qt-project.org/c/qt/qtwebengine/+/436316
-Patch: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebengine.git;a=commit;h=81bf140583f7b7bf13cc8dd522e1ca2aba873fc4
-
-From 81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 Mon Sep 17 00:00:00 2001
-From: Martin Negyokru <negyokru@inf.u-szeged.hu>
-Date: Mon, 3 Oct 2022 12:20:00 +0200
-Subject: [PATCH] Do not intercept websocket connection when there is no
- associated frame
-
-This fix is based on chrome's implementation.
-
-Fixes: QTBUG-107144
-Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-(cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/core/content_browser_client_qt.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
-index 020ae916af..99a3aa3f4f 100644
---- a/src/core/content_browser_client_qt.cpp
-+++ b/src/core/content_browser_client_qt.cpp
-@@ -1237,8 +1237,7 @@ ContentBrowserClientQt::WillCreateURLLoaderRequestInterceptors(content::Navigati
- 
- bool ContentBrowserClientQt::WillInterceptWebSocket(content::RenderFrameHost *frame)
- {
--    Q_UNUSED(frame);
--    return true; // It is probably not worth it to only intercept when interceptors are installed
-+    return frame != nullptr;
- }
- 
- QWebEngineUrlRequestInterceptor *getProfileInterceptorFromFrame(content::RenderFrameHost *frame)
--- 
-2.16.3
-