gentoo auto-resync : 20:11:2023 - 17:13:50

5 files changed, 21 insertions, 3 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 97c56d95bd43..5686611da419 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,6 +2,7 @@ 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.5.2-cstdint.patch 1082 BLAKE2B 0d3376d82ef1758451c8e9ce56ede52e16be486610431357eea9061e19cd78c8f53b66d46ad969b148ff847d921c78ae25fd329efc5cff776e6c99aa16c2c2fa SHA512 fe88703eb39ba713a166c211b17619fa6e31124339b8736a3c5b511556c5249ab8302d9ec8d8702292a318c5df201a1bd96ac2c82e6742fbc5d3782b7cd0207b
 AUX qtwebengine-6.5.2-libcxx17.patch 2548 BLAKE2B bd2ebe5f51505dd20d0fd65a0ad90b7afb106719f5f531c2de95fccc7720255e13dfa7161dda1284fa9da668e81c7df00a59136ed8e355c6ac0f8d335ad76220 SHA512 ec2f96691bd739ad4f3f4d7c0909491ea3a0942e33d701210b368c49c24e99d09c8ea29afeddf6d24678b92d985022dd39e8d05defece0e6a624d794c5f412d8
+AUX qtwebengine-6.5.3-icu74.patch 629 BLAKE2B ce6f1c2a3decd5ccb489e8732d972f47d82d91a24808595329aafb54a91e6a9e929d46b9f067151c4c273b87a7453a60093ea5872583f4a8e41b139522dcbeb6 SHA512 7718ae8829b853f576922274289c5a47378dfa681a7ceaed5fc130b246c09134f06cda47a08236179615927f2d9c7781614ce31b8d9e7b10431fbeab9376440f
 DIST qtwebengine-5.15-ffmpeg-ppc64le.tar.xz 12080 BLAKE2B cfab4f02b8fac8ae7585eda0539f8adf988413aa52503caca3a347a62f75584efb42bcfa4832aadfc51fb98073f4ed3ddfc9701caf570e7186e0e1357af9569f SHA512 e0275ac4eb8d113581fc4fdf42be831903496b6ed95dca5b3d88113107e5453ee8c40df0e2956dd4e343b08e09c57607b1b82a78bf77a780225ff0030a249cef
 DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
 DIST qtwebengine-5.15.11_p20231102.tar.xz 299223768 BLAKE2B f0c3e00e2b266d54bf4239ca15c1dff1142f5d49c70780e7774ad3503dedd257430f17966d61ca78e9f9b7c53f0775a3f4ce3a5cb58b0b2d1bd839e84d097d8c SHA512 124e3291a444416a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb
@@ -12,8 +13,8 @@ DIST qtwebengine-6.6-patchset-3.tar.xz 9920 BLAKE2B 12b287392dabf1f1e3e99381ab1a
 DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814 SHA512 8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
 DIST qtwebengine-everywhere-src-6.6.0.tar.xz 421117212 BLAKE2B b168913644e07d3d649082a78a03ccfb135960ea61907046f3e16c28471a9684aca4685ea907ed47a27719647ae0d9c753d4faa9e24c9897e88dad24b08bd774 SHA512 30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366
 EBUILD qtwebengine-5.15.11_p20231102.ebuild 8728 BLAKE2B cc1d87205949289e8d993b9e2656a91cfb1a1800725111c2b2c7d4ca8565b41f637841961ca9706d56fc5e2899a2bd220fabe9e22247ac59423d852123f9b2a4 SHA512 997e79d2939c9ae03c5890c99c4b7a163b73e545ba4bc3931a0de13ea9a235ee5133ca8b6cb67419aad9d1b25ec834819fa5a5d1a4f6dffe40b89c40e709483a
-EBUILD qtwebengine-6.5.3.ebuild 8303 BLAKE2B 92cf5dad4a36778bfa7cbc282baa4d5296215a819a591c453a5772b0ba575fbbea5548bcdd4a50236178422c5b08fd487d151ed9cca506adaedc24c2d913d4ec SHA512 4c540026fdc658e4426d64a1ac2e848723fce05a7e62dde1313303a2fa83db4c78d6f2e03627d16767ade187f70e5ebb39645cb987127ca114dbd91d9cf72222
-EBUILD qtwebengine-6.6.0.ebuild 8595 BLAKE2B 31d24fe2192b598569a58cca547a7e962981a5757fe37a91eac8c3346a4c4d5744c67187f0360457b83968f923b957e4b943cf9e0a29615951775a0bf6da025b SHA512 d22ebb55538e7d878f27c61bcff76d7b13a6247942d23ef8cea4ae7d7f2ccedd0b6dc92afed63e6177985c0a78309c82097a3f166915fe2b007bb5f117fe3b6f
-EBUILD qtwebengine-6.6.9999.ebuild 8587 BLAKE2B 80180f5c67f91ea2c0b043026f8356af404a4505d33c2aa29d22603807fd2d917bfa5b4562e5f812f4b761e8a00a23f19f86825754f247f258f5585903a9f924 SHA512 306c9c28fdcd85c07213acf1b04b78e6b9a05a1c2a84b82ff8c2ce2bb91215fd0588262ca075b7468a129652525f796d93aba200091959576c809578e4648985
+EBUILD qtwebengine-6.5.3.ebuild 8342 BLAKE2B a3401853bcd8c6014d7bf5970bb5343dbb68432da86c78ce87370995c23db9a6e3a5438e0e26422da368cac74d007c1c53959ce4ce21800b018e503a37f256f1 SHA512 c565266d47ae5479b51accc5818867c96a79cbcc25ac00ca5dfe2cb342707a2d25df9d04a999a499a788e46850205e2d342a9f29f6d2ce2207b095d4a5ca3edd
+EBUILD qtwebengine-6.6.0.ebuild 8634 BLAKE2B a32d842b32d07a95aa3f43a747d1ac2f69c0afddfbadc9a515deedf2458a841d7b39f854593808f66a808767d7694ee44e36e10a8524963991578acd1267f410 SHA512 5ed09ac69d48bded3ec1a8882b411921b4d6837d156e10288c3076cd662b4d0e750675a013b4a68834985372c47bc9b5b8b80f6c93790fe833773fe67a997711
+EBUILD qtwebengine-6.6.9999.ebuild 8626 BLAKE2B 022c29985f5e5d46332c4f70ce4624161bff29c0a633477e4d607bcedc75977264cddbcdfc8bb7bf878c4368c13cf56c33710790695e206eba715c5887654f9d SHA512 5419f1073c1d2e75c44dfc19bab509fbb0d12b52755fc4cd962a5d222a268f2c54cd73b9f55778d40aab8b730819e16d4e783e0fdf253dcfd27e740517e8f367
 EBUILD qtwebengine-6.9999.ebuild 8587 BLAKE2B 56fbe5f82062b45a1d8fb3a00b9f3d48418c7cc99d67233ac5f6a737ccaddf7a312f5a55a42787962bc6fde21df512cfa1ca231661ab423147b98310b5b66472 SHA512 fcb50ddfcf6155389d036cc5cb6fdc764da1646037618025cc7e81dda6256f6d68dd4a8414b183d13889b7c68716c3348f4f1dd5af9312e5c56ae4b973570670
 MISC metadata.xml 1312 BLAKE2B 4473aad7240926735bbabbeaeff862f3bc253c3e79e09086c17fb9b603ba5e9dc25ecbbc423a60a344bf471e11634c9b4728222e66f3d19022e3f3d2c9cc2f60 SHA512 797e67cf05a37dcb5ad5712cabef051b4a8f5dcb9601b627bcf029e4c99d0a09fa62b03cb9dcb64b5b6e5f29104e72711136d4c9aa79928c34f6bfe212742e2d
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
new file mode 100644
index 000000000000..d08ede535862
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
@@ -0,0 +1,14 @@
+Quick fix for a static_assert failure with icu74. Still waiting
+for a proper upstream fix and unknown if entirely right, but is
+an extension of [1] (is now 48 rather than 43).
+
+[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+@@ -163,3 +163,5 @@
+ 
+-#if U_ICU_VERSION_MAJOR_NUM >= 58
++#if U_ICU_VERSION_MAJOR_NUM >= 74
++#define BA_LB_COUNT (U_LB_COUNT - 8)
++#elif U_ICU_VERSION_MAJOR_NUM >= 58
+ #define BA_LB_COUNT (U_LB_COUNT - 3)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index 286f497b5721..41ccab685127 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -103,6 +103,7 @@ PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
 	"${FILESDIR}"/${PN}-6.5.2-cstdint.patch
+	"${FILESDIR}"/${PN}-6.5.3-icu74.patch
 )
 
 python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
index e276911c1b95..234c81fd1039 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
@@ -111,6 +111,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
+	"${FILESDIR}"/${PN}-6.5.3-icu74.patch
 )
 
 python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index e96a31845a16..d7f460872c21 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -111,6 +111,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
+	"${FILESDIR}"/${PN}-6.5.3-icu74.patch
 )
 
 python_check_deps() {