gentoo auto-resync : 07:08:2024 - 12:37:20

8 files changed, 68 insertions, 13 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 75035f2e5085..1fa758c45c91 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,14 +1,16 @@
+AUX qtwebengine-5.15.13_p20240510-gcc15.patch 1308 BLAKE2B d206c6df9b88f706ade2f501548d880692ac032dd4767a279faf90e546eca9390f7a4c89f2fd23cc7d9e865bc27b0da398c60de2440ba1cd0a10cb5ccfb86e28 SHA512 fb5162c3ea8865fc81762c5571ddc63efac89dbcb6029a1b749a07f5944cf9007d92a24b764459301a1292ccbc057bee415f5dd86c75ae2a53981bad31e4e148
 AUX qtwebengine-5.15.14_p20240510-icu-75.patch 5107 BLAKE2B fc61801f5bbf5583610afe5af8ed60a90f94a248c0aa16b94f6df96e239e9c1cfe1fc40da487d3a25fc600a798b33c5bf8384c6d6cfcd0ff9446c20aae5f8f84 SHA512 b812dc26e6135cd69df9ef3b9049509be9888e012394af3c496b03666e80c63f4c827916398d94f7499f73739ca70829108b60705d5b2329f3134dd695a029eb
+AUX qtwebengine-5.15.14_p20240510-re2.patch 915 BLAKE2B a29abbec923f78dd7baafdc36b42ed9e0467885ecc04349cbbcec6727628627e84e0172f01e24b34c231d437b75f992b7a173532695085773d899dc94085c66b SHA512 45af510bafc1c838fe273652813d4130ecdef30152f57506b5b6580131cdbcf510acc5ae7bb8d44ac90072c8be7d75b4e0c187240a6522e184db8a11a204f2fc
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
 AUX qtwebengine-6.7.2-QTBUG-113574.patch 1696 BLAKE2B 10d4bca0527636a3934ccfdf6e52fca4ca369d07624c3b63377dc899a2f0313a936347d73dccf2f35d259f43c9c76bb7519b85339468b93b49862d3d5057f23b SHA512 bb2489a41da7b7a00fe58fee963b89e6ba8ece2c1a8f29e75169db7400a475473866c71bc78825875d007cac1e98175251b1f5fb4bdfbdd4318d32fc6f7871a2
 DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
-DIST qtwebengine-6.7-patchset-9.tar.xz 7440 BLAKE2B 061f39250450af3c8d4458649c80c18d0bf8448061e0bb91f8a0d7c630ff1cd2ee19a9528998c5a4a3ebab1e96ea0ba579cc0db5d879fe56a1239901942ba933 SHA512 4dabb56d6c74600f8d5a4ebb4356ffaaff1814eefe1cb268e33749fee034e9488e34043d0ce0893138ee01b023c09298c737bca3875a30be1bf862a145e244c7
-DIST qtwebengine-6.8-patchset-1.tar.xz 7512 BLAKE2B 04eee1a1008f8a193dbb719e08c61e26a78cb68f3a0b9f7cc43b442bd2d851301682009ad7cd96df13da1c0aa7e9459b1b7024193379509abd4784e2547276e7 SHA512 591e5340435a8a40b6805d3db07b440bf185c694461382051c668e41f2ea5d04d5d7ab72602f557ee91a687d6187e919d662751e32dadaea8dc19de568e2c54e
+DIST qtwebengine-6.7-patchset-10.tar.xz 7940 BLAKE2B f3ed0e75731f29f37714ef7c0536f92a758bb1f204cf3b6aa3b9b32ab9baae27a7649d030bee5962964619692dd5888d089bf4437505d1c1c330cc4c05aca17e SHA512 db3a566a073daa34d678a06b51cf57e8818f2d42847dc9e606522040bbd3b75ae56fd41ce466880855cfdf558d680204dc5ccea8046749b18784e75aa12efe47
+DIST qtwebengine-6.8-patchset-2.tar.xz 7932 BLAKE2B 3642f619c66075e26703200818e833786a8686bf39258eee9bba95e234f79878f0b98680e8228a5b2cc39b02b0ecc36074ac96eb09f3bca145bb7aa9fd023310 SHA512 4a248d6e7bd052b5681a531fe503954aa519a8ed46cce2b3fafe8de603818f20e80a365e304f919817a6a0c12fdc517a0471f5c6dc499e648fd5405456c9fba3
 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
-EBUILD qtwebengine-5.15.14_p20240510.ebuild 7659 BLAKE2B d930e49649e91657fbe65668a0dfe41ebd4732d4901c36f59f562094d9cb9d339157bf0f5c4e8b530270a13c8a40449ac4800ce9a17a29069be1c7177c288452 SHA512 6c621d916a502e778fb9662dba61161eb55b6ab37bd1045d5a96924bc943428b3ef28512d7838b31b4bfaa0ac43e23b10a66d67fdce2505139325cc837dd756f
-EBUILD qtwebengine-6.7.2.ebuild 10381 BLAKE2B 38654e43a9c524829c8a31f9e0e6b06428a7626ff237c6022dcf9ffe2552f4239153702dbaf633bab51bb1ecb239fe3af6997ad779d8e944a0661d215719e204 SHA512 c2fb4ea75b501d5d60ca890f244115db8319949fb4af3d864c777e62154635c430d9307b0aff44d568b4d95cb6de68c0c9143ef14b0275237d3d4db7b3158bd9
-EBUILD qtwebengine-6.7.9999.ebuild 10383 BLAKE2B a48d23b446dd01073e0250213733c41ffe0d856c2a7db95aa3d160c49e8f1ea07b93c2e8fa016ebc8477e98b781af0374b6c090b0bd45f19d873c63fe3711147 SHA512 bccd4d397ce5ed9ebe91c7c422e91f6def0af290d572261331e574bcd1f6954c7656c7272ccd5d6869766f08e457b0a96eabdb4b9e321a5f90bf8cbeda3aa03f
-EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c
-EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c
+EBUILD qtwebengine-5.15.14_p20240510.ebuild 7758 BLAKE2B f1c2e30680f12164b8a1a55ecaecc6b7a786cd173ae3500825c7ef04ebd53bd579d2c74a7648ff65c3c302a0f2955313814e0fd1223d564fde76ff7e0039d6d5 SHA512 37591ca47d0df49df995be8af07da94f32ee3d5e03bf9acf987b9966092e48e481d8fac5c3af920265a4736e95f8200be24cf75683e577ef135249555ad6efa1
+EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 5b230dbcae1920f95410d356638af03992f24d06db10fec22b29bc86228da985a23dc28e9836d618d600dfaa94cacf119ad8c5d8179a1d0e56d56ac8044b7b67 SHA512 c87490fb23f9162a2664339f006655b3e143bf721a48865c12f5af078716f684587158cbebb68159ebfd42a60b151118ffc8ea31606268202d9d5e59fdb06b47
+EBUILD qtwebengine-6.7.9999.ebuild 10384 BLAKE2B 83ce0ea97744f21a13074b7e2901aeb88aad9c3bae7a1d01bf5339003ddaf076c320d05244eb91c79155bc1afb3337d7b2a6a1f3de136d7a47f60009cf4e374b SHA512 d94a56943c5447fbe49e16d9876b17c3367d818b792c7d791650febdc75efbc827a7dda51bcb0a987971e78c36624226b9878d0d9b9860f3103cdeef99e28a44
+EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B dd9842294ee9618e5cb73bdb3f1b6f9ea98220cbc45317fac6aaa622b15f8d29ef3c768f2ddea2d57122cc7f206474d02bb3a50cb4f0cea2710011ed00c7086b SHA512 d535577cf79ea4b4586a0fa60c0f16989e753d21b580b66a67a21582cbc0c4715a3a05f46823f6c9d45dd2d0db016392c8ce24695202422fe01332dd00406c4a
+EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B dd9842294ee9618e5cb73bdb3f1b6f9ea98220cbc45317fac6aaa622b15f8d29ef3c768f2ddea2d57122cc7f206474d02bb3a50cb4f0cea2710011ed00c7086b SHA512 d535577cf79ea4b4586a0fa60c0f16989e753d21b580b66a67a21582cbc0c4715a3a05f46823f6c9d45dd2d0db016392c8ce24695202422fe01332dd00406c4a
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch
new file mode 100644
index 000000000000..d3073b6c5ab6
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/936416
+
+Backport of two upstream commits:
+* https://chromium-review.googlesource.com/c/chromium/src/+/5512719
+* https://quiche.googlesource.com/quiche/+/c1af894e0f5c4f732a983e7c93227854e203570e%5E%21/#F0
+--- a/src/3rdparty/chromium/base/containers/id_map.h
++++ b/src/3rdparty/chromium/base/containers/id_map.h
+@@ -153,8 +153,8 @@ class IDMap final {
+     }
+ 
+     const Iterator& operator=(const Iterator& iter) {
+-      map_ = iter.map;
+-      iter_ = iter.iter;
++      map_ = iter.map_;
++      iter_ = iter.iter_;
+       Init();
+       return *this;
+     }
+--- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h
++++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h
+@@ -198,12 +198,12 @@ class QUIC_NO_EXPORT QuicIntervalDeque {
+     Iterator operator+(difference_type amount) const {
+       Iterator copy = *this;
+       copy.index_ += amount;
+-      DCHECK(copy.index_ < copy.deque_->size());
++      DCHECK(copy.index_ < copy.deque_->Size());
+       return copy;
+     }
+     Iterator& operator+=(difference_type amount) {
+       index_ += amount;
+-      DCHECK(index_ < deque_->size());
++      DCHECK(index_ < deque_->Size());
+       return *this;
+     }
+     difference_type operator-(const Iterator& rhs) const {
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch
new file mode 100644
index 000000000000..cbfa44edce31
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch
@@ -0,0 +1,14 @@
+# https://bugs.gentoo.org/913923
+
+    Fix missing {-no,}-webengine-re2 command line options
+
+--- a/src/core/configure.json
++++ b/src/core/configure.json
+@@ -16,6 +16,7 @@
+             "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } },
+             "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
+             "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } },
++            "webengine-re2": { "type": "enum", "name": "webengine-system-re2", "values": { "system": "yes", "qt": "no" } },
+             "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } },
+             "webengine-pepper-plugins": "boolean",
+             "webengine-printing-and-pdf": "boolean",
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
index 9eea881bc404..31ca92a14959 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
@@ -41,7 +41,6 @@ RDEPEND="
 	dev-libs/libevent:=
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
-	dev-libs/re2:=
 	=dev-qt/qtcore-${QT5_PV}*
 	=dev-qt/qtdeclarative-${QT5_PV}*
 	=dev-qt/qtgui-${QT5_PV}*
@@ -99,7 +98,11 @@ BDEPEND="${PYTHON_DEPS}
 	sys-devel/flex
 "
 
-PATCHES=( "${WORKDIR}/${PATCHSET}" )
+PATCHES=(
+	"${WORKDIR}/${PATCHSET}"
+	"${FILESDIR}/${PN}-5.15.13_p20240510-gcc15.patch"
+	"${FILESDIR}/${P}-re2.patch"
+)
 
 python_check_deps() {
 	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
@@ -228,6 +231,7 @@ src_configure() {
 		$(usex screencast -webengine-webrtc-pipewire '')
 		-qt-ffmpeg # bug 831487
 		$(qt_use system-icu webengine-icu)
+		-no-webengine-re2 # bug 913923
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
index bd95d3e001b0..558e4e9ca86c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
 
 DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
 SRC_URI+="
-	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-9.tar.xz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 1ad6561ecc65..73f482a28fcd 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
 
 DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
 SRC_URI+="
-	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-9.tar.xz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 16c70f30d158..66f2a52045b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
 
 DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
 SRC_URI+="
-	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-1.tar.xz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 16c70f30d158..66f2a52045b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
 
 DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
 SRC_URI+="
-	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-1.tar.xz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then