6 files changed, 37 insertions, 31 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index efa411a9a0d4..3fbea0f87732 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 23da7d4084c7..1da35a6916e9 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,7 +5,7 @@ AUX qtwebengine-5.15.14_p20240510-re2.patch 915 BLAKE2B a29abbec923f78dd7baafdc3
 AUX qtwebengine-5.15.16_p20241115-py3.13-pipes.patch 848 BLAKE2B 7696eaf565511adcac5e74f7788633d1e83a88079548f1069c840da40e3ec5fef5fbfa0c019234a40dde14f6f43249792ad1bfc3d2ee8e5669d7fde7234a7ad2 SHA512 79588891105d8dce27e273d4113c31352c6b1035762ea6b1211be5f58299d9e2852b0b98bad34492d9af85e3ae1ca87407ffbf190159d64b0c6d7ba49e842bf8
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
 AUX qtwebengine-6.8.1-aarch64-xnnpack.patch 629 BLAKE2B 2809c1e159252c3131c318cd31fd6d7875a41ca477ffcc82b832838eeb0b89ed15baea25f95c894369b73fd41c7cfea0fcc880b5fc097b8e987b718300fb7d3b SHA512 b1e3330a2e6e8b352cf83b8c2e9b469772638d331b78c9f690208044a72a1bbefc5b3114affc5a512a8c0839ece197322a8382da8e8c3be18042a9c394034c31
-AUX qtwebengine-6.8.1-cstdint.patch 1136 BLAKE2B 8dc976348896073cc6f884199d6ad13a0e5f377707e6046d84bfc7927b749729ebe1f1b0b2f2c930094201647bfd638405ebfe4dce5d3583844f2a95ead5169a SHA512 12e65e9f1ca2ef498e4fba4769dd5bd3c03935f6c2e69ab47ebfab1f5f4637616c4d2303fdb645f404a3348a5701a132a204bf55dd80b54497d18294800014a6
+AUX qtwebengine-6.8.2-cstdint.patch 1221 BLAKE2B 8e2131e54dc398c7518ba49b75e38db69517c9abddf44dad2bcddb0c1e364316965cdf8f439502fa9c8b92916532fb7f5316dd8122dee7852508a098f1556976 SHA512 8169ef9bbce67b1e51aea3611ef3c4dc8809d89fcda78cb91fb7e4952aa7c6a5b66c7c4b73724953c2b69107c240f60e37e7d2d209cdbfe84ab2f8c76c15b561
 AUX qtwebengine-6.8.2-glibc2.41.patch 1062 BLAKE2B aa5f6ee4d1333bd9fba543855637f7264fb1abaf6fa62859733352768673cb72a84e4c2b47802392c9ea5eee75b8ce4d43b485683ef78b178d6fea379da401d4 SHA512 2128a7dd9703bbf562a0e966d55b5eed7e7288e715bb67f08d982aa3b95766e60a1c62f75b3291987ea8523ed9b8482110c8410c212783d907946ddbbe655f29
 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
 DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2a603a28881d9cf97f339d951217f3837d614ebb58aff9b0963220be04cc9a17869b6021a6d7687848bd8ccd1c8c49115a5e6944be84b SHA512 50e0bc7b4236859b4419f2f8eaf37e47c1994c30ca3bf584dd2f4996b5f8ba7cd31c8aae48c28f0fcd39c144490f5e451c7ecf5d340e7b10fa2e37666ef21100
@@ -13,8 +13,8 @@ DIST qtwebengine-6.8-patchset-7.tar.xz 9096 BLAKE2B 58a95b198a6c8180a71a4365e7c2
 DIST qtwebengine-6.9-patchset-2.tar.xz 7952 BLAKE2B e83c8da8834999003c61a641d36da691d017455f1d074471aad911e02f2bb180488d5ba9559fffb2413db853d7dd0ffc3a0f48b886b223485396e0e4cccae79f SHA512 a5ff0d5481eb15787c2c6f606f03b1c3ab952473d0118803b813f42982f6f9816e285ed9221a20b2285c725de8edbca235648a4c1a34f984fedbd874720df778
 DIST qtwebengine-everywhere-src-6.8.2.tar.xz 566518084 BLAKE2B 312fda4150bdc1aee25625440baca45b532ecd7a1ce24d3dc3ba990cdf208c3ba42f159e02c881f38b56c29b75677d9001e6222d35b4c96fc39eecf65502e9c7 SHA512 27590ec53845fa36f48a5a0506d505995850027d85bf33fe0413733cbde5c2744e8ea49f445c91d84b8d43454b9f12c1cf7005d614bbcae1a29d432fdacdc0e4
 EBUILD qtwebengine-5.15.16_p20241115.ebuild 7879 BLAKE2B ce3061b704385359455c0885efe935b9bf1f8e5627ba06a9fbafb1c95cfccdef6f39331868bbaf3d5794d708e7bb6c01cbef28c1880f45fb60d9e81cc73dcf53 SHA512 c31bca254f0962e39f763f49f22930d7c6d51a68169b72e9bf9afb111a01e40c15c82d86743f185480f092c85e8e17c51dc4e07ee7557ac449a00a8d3952be6f
-EBUILD qtwebengine-6.8.2-r1.ebuild 10355 BLAKE2B 97e6e0a2210d2f7c66aebf45de12c1104f842b660f84742fbaeff8130032268a2dbd0a7d98a33c768ac5fb14c12e6d7c28ee3c8a4e6c4ec8d85e74a2a6a18b58 SHA512 31c77831933cf1d74e6d709d90c0cc1bee0db8736a8143477c75e468f1982195f506d38d2c86815da9535247b0fc6f8ea9d4b8d7bb87353ca44153022b264c24
-EBUILD qtwebengine-6.8.9999.ebuild 10427 BLAKE2B b6367f71b635cabd4fe76c69a95cf7698e81d271cec4113084f1707ecb489f8b735a4a1c21955e00dce8fa47c05a8b14946278ee036fbf52207b071e1bf23306 SHA512 857647f9cfd0e4b6e5c2d0b619c274a8db4a738cc38b74f483da465b4a7e4339af3d9b1bce1402d04ee8c45533e2a23d2f2ce84a6ecd11a6c18a4a13d816a95e
+EBUILD qtwebengine-6.8.2-r1.ebuild 10355 BLAKE2B 5b424120e4b4a7863efd4d0c348e2ce56473bf8a9f78ffb81789e7f035c5d6f67071df2759f5c4dd2d4152be406952b9f2eb99e1cb15d748d98b08c9bab3ffe4 SHA512 c9661cf047e755a8cdf2b6506ecf8e8069931dedb6c48a8fade025799471f76d2bbd5401e80261a1d41b0649a9f0536ea205a5889cdb7defac7da3bcd10f3999
+EBUILD qtwebengine-6.8.9999.ebuild 10427 BLAKE2B 3efcc09a6cfd8a04d7bec2ee439d8684e4a4d6a40f50dfc4422e48862b4e408b694dbd0daa037d1643423ea0b664f614b036a37b37a2837dcd9e0d4b6bf7ca64 SHA512 22e36bad5d1a6706c1557764ca56c3e5f897993b0bba36d35a3d3ffc377cb1f72f71ebc8f7cc5e5c719e0d8fc6c5e4d1768bfa6d877e81f0d7e0e6a7f60ca965
 EBUILD qtwebengine-6.9.9999.ebuild 10490 BLAKE2B 85283b6f64043b054bc3931993bcdf6444d2e6416cc9386e0e4a0c59d540cdbc7e3b716bf4832ebaeb6007d53b6c80fdd56e01354729e02b04a252dfb101f2fb SHA512 2985f86386eee23d27767537b0f3f6d4650775cda175c2d682a6f5a0bd553dcd0d70a54ce7bccbe2ab6a6a73ccd6e2448512029c3d8383a619c1812235da1010
 EBUILD qtwebengine-6.9999.ebuild 10447 BLAKE2B d6c57f76ac7ff1eed87b6f690268b0d3830238eb6f6fb9268ce019d04b625b20f99c7f1ebb816db961d77dbfaa946fcaf1cd0568cb09aebbb67f910e049a2211 SHA512 c56cb96bc2365e39a76c35f86a617f204826a77e7957cf466364e62d5a62d336669185875debd66393a9a63f6a58a5f4fb01c83a3d1ec9605da3eb1f8697e7c1
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch
deleted file mode 100644
index 10f410856032..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Patch status: fixed in >=chromium-133.0.6892.0
-
-IWYU issue, only manifests with gcc+musl (clang+musl or gcc+glibc are fine).
-Backport of [1] (>=chromium-133.0.6892.0) and [2] (>=chromium-128.0.6571.0)
-
-Note have not tested USE=-jumbo-build which may expose more of these issues.
-
-TODO: merge in patchset's cstdint.patch and keep a note to review for 128/133
-given a lot of commits been adding cstdint/stdint.h and all hunks may not
-necessarily fail to apply when fixed given headers being added differently
-
-[1] https://chromium.googlesource.com/external/webrtc/+/000f04375b67e6139a1dc88d832d2da65c7acb29
-[2] https://crrev.com/0d3d5062f7d5ff83f38685bf864c71dd5bd9d460
---- a/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h
-+++ b/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h
-@@ -7,2 +7,3 @@
- 
-+#include <cstdint>
- #include <optional>
---- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc
-@@ -12,2 +12,4 @@
- 
-+#include <stdint.h>
-+
- #include <algorithm>
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.2-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.2-cstdint.patch
new file mode 100644
index 000000000000..817b9ee949db
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.2-cstdint.patch
@@ -0,0 +1,32 @@
+Patch status: fixed in >=chromium-133.0.6892.0
+
+IWYU issue, only manifests with gcc+musl[1] (clang+musl or gcc+glibc are fine).
+Backport of [2] (>=chromium-133.0.6892.0) + [3][4] (>=chromium-128.0.6571.0).
+
+TODO: [2] likely needs to be kept Qt6.9.0, but the rest is already present
+
+[1] https://bugs.gentoo.org/950579
+[2] https://chromium.googlesource.com/external/webrtc/+/000f04375b67e6139a1dc88d832d2da65c7acb29
+[3] https://crrev.com/0d3d5062f7d5ff83f38685bf864c71dd5bd9d460
+[4] https://crrev.com/26f3c318377ab31c2b317b656613e2d3c11ce513
+--- a/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h
++++ b/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h
+@@ -7,2 +7,3 @@
+ 
++#include <cstdint>
+ #include <optional>
+--- a/src/3rdparty/chromium/extensions/browser/path_util.h
++++ b/src/3rdparty/chromium/extensions/browser/path_util.h
+@@ -7,2 +7,5 @@
+ 
++#include <cstdint>
++#include <string>
++
+ #include "base/files/file_path.h"
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc
+@@ -12,2 +12,4 @@
+ 
++#include <stdint.h>
++
+ #include <algorithm>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild
index 9f63f5d27431..62c463abe8da 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild
@@ -109,7 +109,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch
-	"${FILESDIR}"/${PN}-6.8.1-cstdint.patch
+	"${FILESDIR}"/${PN}-6.8.2-cstdint.patch
 	"${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch
 )
 
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index b41603e45458..7483978a7750 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -109,7 +109,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch
-	"${FILESDIR}"/${PN}-6.8.1-cstdint.patch
+	"${FILESDIR}"/${PN}-6.8.2-cstdint.patch
 	"${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch
 )