gentoo auto-resync : 17:04:2024 - 12:04:27

5 files changed, 50 insertions, 2 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 7b742102b661..ee88b0caeddb 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,6 +2,8 @@ AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d4
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
 AUX qtwebengine-6.6.2-clang18.patch 4565 BLAKE2B 73059ca5a86e8e7098e6d6228bcadef4477d7c21b02e9dcfaa8cb3525545c255f31d8a3b2608a91b7aa90cc6090effd18ba41f4969457e6af68614f74a80da90 SHA512 688ff84d742753e4c6ae235f09b32e5894e0cf704eca78f221b1511e4dec498d5b7615240fdeed27e9eeeadeca8822e51cb86172cc17eb271ee2578853b07b40
 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
+AUX qtwebengine-6.7.0-ninja1.12.patch 1173 BLAKE2B 11e1801ac32a984333bb8e81aed93471d3da330205508222e85140e1784654668dc1cf9e6a207d91f162568e0ff2d66c34c345084f62a4766745bd66f8927f94 SHA512 4cac6ac4abd17aa958db8c61026a80f4e363f7d8b4ed8fcc9660618e2fc2c7ff0eba03d3ca043755b28d9da65d819538b5f5982dff64ca1dea0043f7266ede36
 DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9 SHA512 cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
 DIST qtwebengine-5.15.13_p20240322.tar.xz 301394204 BLAKE2B f9bb5bb79edbe0bc862a718feb3b11a56d8c6d2eee1dd711c9b4460f64308fdfbaa4c3551eebad3af5844564a49703574a7fb9d74e15abd0a6aeb8c707a14059 SHA512 b1f459fbb3d21118043a53ce6e292c6a45f8512830f4dbf6982713970f980ccfb8c1ea1c1d7ce373991632de8c44b5053fa1ccb883e19cd8f35a961e67472f5a
 DIST qtwebengine-6.6-patchset-10.tar.xz 8880 BLAKE2B 7583dbfbb60100dc669c780d611aa56034ba2172700168c716e06b37cfb8bb083a29b3ab36968ad0f34443224f7ce03956e6fad2734ac7ff62b2aaeba9e79fc4 SHA512 3cf5e597d7300b89297f15f10ffd7e24517f8762ecdc7b3be19f3c48bc16949ec47ebccf050d4416033e1915453c12b0e69ebb2defa50471cdb72794f8e05708
@@ -13,7 +15,7 @@ DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657c
 EBUILD qtwebengine-5.15.13_p20240322.ebuild 7285 BLAKE2B bbe6f1ab236d00678bd334ec33529fe15fe494c72edeecdb35004c804bb61c6f9d788359b1fdf2fa42d1a455b754716bd58db88e8f2328ea8226e1e5f01ce208 SHA512 4d3affbe7612d24f2e692b4a9b9d261024783b011a6319f337ea408470d464bf538f5addc9ce0f9b82114078003d14ec413e3456d1ba348ff1a85ec6c2b10606
 EBUILD qtwebengine-6.6.2.ebuild 9404 BLAKE2B bada4c8cfbf518a600835b2cc19efb21e3a34909fae7c37814ace181c8312ff2e8ef6cf431fe6a98c73261be29acd4713a7c4d3cae845dca8f1df8a9ce76fd69 SHA512 2d5c4638a51c3a678c45ae98da9a9d0958321e8fd36dc2cf4e0506fcbf104a12969e0c79cd142e8b25e6b8aa642f92cb321ee364121eddffa933410b96cb06bf
 EBUILD qtwebengine-6.6.3.ebuild 9393 BLAKE2B 2a1fa7cd0361f939a2f4a8f45c9b6e273ed8f9fa963cd6cc01f44a60f65aa5cffd51823d666f68b658e839c92f8cf2e03d548d64c92b26a436215d6229bbd453 SHA512 dd234a8963544b256d2dcf739e2e7a468bb4d1bfcbf75b5da3ee6bb0889b6421824cb52986a7c318da13aeea087ab512aa548e9c59a4f35426f78fc0006e9810
-EBUILD qtwebengine-6.7.0.ebuild 9772 BLAKE2B 05686d981f145a4df060fec8592bdd3a3d0d25c9134754d05c04ced03b884e4370c011ce4cc916c4e78488b63aad0397cb6ffebe48d98002541da14a6345d34a SHA512 9dc282903a59b50da7688ffe42a176b589327dfc4dba0b67e28a4d42efa9a873e96017e82d241b13e138df67a8e1b2cddc5cca3b55745f0ee8eb142e20cf80a6
-EBUILD qtwebengine-6.7.9999.ebuild 9774 BLAKE2B bc5dd440d6a58db487d0db3c85a0cc90d11fb689efcc219a2dca3ad1bd744b1c5d2a712f098507f790840474afd50fea13536c8864b2ad2438561c1558c36691 SHA512 22353f795973c3bcb583576c350514a469d4020a29261570b0e4a63186fb104476bd514d8796e1770448df477e745f554f531602a66897a48e938b5c6bdd0ae4
+EBUILD qtwebengine-6.7.0.ebuild 9866 BLAKE2B 228b79dd1352b9f2724a34968b5bc01b14f9ec50514ac9912e92fda9dd1f0eff677287452e2f2da6bd08418c6bf04ce8b57c5017ef1600868786517fae0df132 SHA512 5bc4350b3a16bd2a0f3ff79b830604da6cd8dbb30646f349d531ba659aad6ffb015c250895dacd03f5ff5f3db416418afe9f7456f0deaa2f3f8e966f4d018662
+EBUILD qtwebengine-6.7.9999.ebuild 9868 BLAKE2B 833d3ad6467e69f8497689a01bd71a0a583881c67e55624ac0f6020c33a21910f87ad50d3eb3059adb7b5a7ac8dc085d7b401af0b74a0aa74d3a76d76009e70e SHA512 4ff245c05d92b839f1326a4ac57390aa6829efa1e8b1b689cdd6b8df03ece16fc35408f399d486a6851d2bfc032ce4cf566853b8ad115670d3b764b07b6d7335
 EBUILD qtwebengine-6.9999.ebuild 9733 BLAKE2B bc70eaf049292cd42caeb8b678ef525f6f92d5231badc72e472b7b4f58e7966259079da653c45e7226a7d17fe7604d7ddf7c53ba8b119ada0097b9118e44fa27 SHA512 25e2b4f5bfebdf0487811b0b4a5bc45e72e67629729f924610605b4d0cf950bb8a057ec80f45ad5fab4d1743602a828a38398533b88fc253471d213642bdeb89
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch
new file mode 100644
index 000000000000..84dce821f80f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch
@@ -0,0 +1,12 @@
+TODO: merge with glx-headers patch in patchset, similar
+issues that seem to stem from Qt's GLX restoration.
+
+https://bugs.gentoo.org/930107#c8
+--- a/src/3rdparty/chromium/ui/gl/gl_display.h
++++ b/src/3rdparty/chromium/ui/gl/gl_display.h
+@@ -12,4 +12,5 @@
+ 
+ #include "ui/gl/gl_export.h"
++#include "ui/gl/gpu_preference.h"
+ 
+ #if defined(USE_EGL)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
new file mode 100644
index 000000000000..2d12daccd224
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
@@ -0,0 +1,30 @@
+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
+--- 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",
+--- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
++++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+@@ -22,2 +22,3 @@
+     "//content/public/browser",
++    "//components/web_cache/public/mojom",
+     "//extensions/common",
+--- a/src/core/configure/BUILD.root.gn.in
++++ b/src/core/configure/BUILD.root.gn.in
+@@ -235,2 +235,3 @@
+   deps = [
++    "//chrome/app:generated_resources",
+     "//components/zoom",
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index ce4b07c90f2c..997dbaf4ec5f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -108,6 +108,8 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.7.0-clang18.patch
+	"${FILESDIR}"/${PN}-6.7.0-ninja1.12.patch
+	"${FILESDIR}"/${PN}-6.7.0-displaykey-header.patch
 )
 
 python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index bab0b63fc807..f9dd54161654 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -108,6 +108,8 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.7.0-clang18.patch
+	"${FILESDIR}"/${PN}-6.7.0-ninja1.12.patch
+	"${FILESDIR}"/${PN}-6.7.0-displaykey-header.patch
 )
 
 python_check_deps() {