gentoo auto-resync : 01:05:2024 - 00:00:04

4 files changed, 29 insertions, 2 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 58bf2c6f4127..a06879a5dd16 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9b01b2cf72b4..22d14bc502c2 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
+AUX qtwebengine-5.15.13_p20240322-ninja1.12.patch 823 BLAKE2B e3942e987e5a59f3621ccaaf2264999a056664f0f7dff50b989f79ced0a4d9279295b84d93b9eec8fed0fc6ace83b1dcefde10c16746392c265a126f8890d437 SHA512 34bac89145fe1b2ca413f0ceb97bb90a7bc4eaa63c7169df052f07085e817dd3f77a6b703aa3dbb5d378a1653b8fed4246c8b2ce02e13be0c61ca7077293832a
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
 AUX qtwebengine-6.7.0-clang18.patch 4862 BLAKE2B 0267bb9c9140cf9baa6264979297d1c218af2e68fde04cbf176b07d52a9e800f6758dad4b31372f9b8a09b7cfe3c6af2be556ea40b7fc07646d7a34f552bb720 SHA512 c13c38f7bbe6d40325fd41b56311cd94fe3a91f19795b2d59c420cb608251bba08146668d156e77f9ecf8e306b2da842b0440abea0b5f44455f1ab74ac245d44
 AUX qtwebengine-6.7.0-displaykey-header.patch 346 BLAKE2B d3591285c2c2b3b795818cc1da0a34307bafb01cdab2dd32df5645e83485ff1e332b257473f9475600d79557074b86bbd3bebfad4a740a2dd4dbff8189df4ea1 SHA512 346b1cf14d332af94c197558a41d12952575fb95ef97ed0b2ed35ac126f88809b30c2ac723fdd70e01253cd90c8b84347e5f7d1b03367d95eabb95ee4b667a78
@@ -7,7 +8,7 @@ DIST qtwebengine-5.15.13_p20240322.tar.xz 301394204 BLAKE2B f9bb5bb79edbe0bc862a
 DIST qtwebengine-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420 SHA512 4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff
 DIST qtwebengine-6.7-patchset-7.tar.xz 9288 BLAKE2B 28eeee2481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab SHA512 0d8583d50679d4609833540293eeab84507aa448c62c0fda62d99c03c7f60afa655f621938fc798a1443ad0a355442f5114714d692bb83aecac99021919a1baa
 DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64
-EBUILD qtwebengine-5.15.13_p20240322.ebuild 7285 BLAKE2B bbe6f1ab236d00678bd334ec33529fe15fe494c72edeecdb35004c804bb61c6f9d788359b1fdf2fa42d1a455b754716bd58db88e8f2328ea8226e1e5f01ce208 SHA512 4d3affbe7612d24f2e692b4a9b9d261024783b011a6319f337ea408470d464bf538f5addc9ce0f9b82114078003d14ec413e3456d1ba348ff1a85ec6c2b10606
+EBUILD qtwebengine-5.15.13_p20240322.ebuild 7347 BLAKE2B b449a017794860e13345e2459841d1ffcd9d3d5f7eef91e9c546724e4622c59762943ac6e7f1e2b3fdd707adc9bad75476e25d93f81c549db4b7e3d8111fd43f SHA512 73e3d01e18bc17ad8cd210cc161a5aae9d7fd0dac6416ff59ed976252d7eedad25d2d2b44597f62a7fd9a105880ba4b00853753e131ae4c09aeb6e06cbb59cdd
 EBUILD qtwebengine-6.7.0.ebuild 9866 BLAKE2B 228b79dd1352b9f2724a34968b5bc01b14f9ec50514ac9912e92fda9dd1f0eff677287452e2f2da6bd08418c6bf04ce8b57c5017ef1600868786517fae0df132 SHA512 5bc4350b3a16bd2a0f3ff79b830604da6cd8dbb30646f349d531ba659aad6ffb015c250895dacd03f5ff5f3db416418afe9f7456f0deaa2f3f8e966f4d018662
 EBUILD qtwebengine-6.7.9999.ebuild 9733 BLAKE2B 4a51857d7e796913d83b8d2f4cf0bd6560e9b3f9391bdc3ec96de30109c4e99423465004f32349a776ea1e2e48fc8090430b9e124b723f8a657ea5bf56d8935c SHA512 0c85feefc3963929254dafd58fe7fa1aa037f8eb287d6a9d4c7a7b9f9f4990cdf16da7ca37991725f87165917c82185359696ededad8440de909c927f05e496c
 EBUILD qtwebengine-6.9999.ebuild 9733 BLAKE2B 4a51857d7e796913d83b8d2f4cf0bd6560e9b3f9391bdc3ec96de30109c4e99423465004f32349a776ea1e2e48fc8090430b9e124b723f8a657ea5bf56d8935c SHA512 0c85feefc3963929254dafd58fe7fa1aa037f8eb287d6a9d4c7a7b9f9f4990cdf16da7ca37991725f87165917c82185359696ededad8440de909c927f05e496c
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch
new file mode 100644
index 000000000000..2da3dc27fab2
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch
@@ -0,0 +1,23 @@
+Quoting the description from qtwebengine-6.7.0-ninja1.12.patch:
+"""
+Patch status: pending being looked at upstream
+
+Issue[1][2][3] also exist in chromium itself[4], and unclear
+why this started happening only with ninja-1.12.0 at the moment.
+
+Just a quickfix, likely not fully correct and seems there may
+be further unresolved race issues.
+
+[1] https://bugs.gentoo.org/930107
+[2] https://bugreports.qt.io/browse/QTBUG-124375
+[3] https://github.com/ninja-build/ninja/issues/2417
+[4] https://bugs.gentoo.org/930112
+"""
+
+This has a hunk removed but is otherwise the same.
+--- a/src/3rdparty/chromium/content/browser/BUILD.gn
++++ b/src/3rdparty/chromium/content/browser/BUILD.gn
+@@ -198,2 +198,3 @@
+     "//components/services/storage/public/mojom",
++    "//components/spellcheck:buildflags",
+     "//components/sqlite_proto",
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
index 22bb5cdc0734..c8cd5e9574d1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
@@ -98,7 +98,10 @@ BDEPEND="${PYTHON_DEPS}
 	sys-devel/flex
 "
 
-PATCHES=( "${WORKDIR}/${PATCHSET}" )
+PATCHES=(
+	"${WORKDIR}/${PATCHSET}"
+	"${FILESDIR}"/qtwebengine-5.15.13_p20240322-ninja1.12.patch
+)
 
 qtwebengine_check-reqs() {
 	# bug #307861