gentoo auto-resync : 22:11:2023 - 17:18:34

6 files changed, 53 insertions, 8 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 1b0a1cb23091..972ecfa881dd 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,6 +4,7 @@ AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf
 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 661 BLAKE2B b6cb9697871596331a0faa21451d9927a6dfcabc14ac8a6ff8e47f446dbcf617bb3a231e23f25df4382bf928814fb110a0134a70246a9bafb436f66054dcc98e SHA512 bc9d1613f1b59f4442e355d4b679ea81448d1b6f5e6f3e08e2bba2441a98a4b6ff74917fa9aafae8776eaf7002df86fb0fb34002d421894e5e511b32bbf6878b
+AUX qtwebengine-6.5.3-libxml2-2.12.patch 1616 BLAKE2B 0e7cfd4801d1d3f213e41b9491809c3b5d9f15e94f6241fc000da53d20dca9b3fb0a7a91517f7319d5474aed38311631dcb629235a528cf98362084219901bde SHA512 70eeed913b17719da02ca9d1af6d05655d9e6e9557b8a7f433b9a6a66043cd09364ca1d7bd402ce620511a8eb50e47917890185ad5e39d04d0c254d1a374fd50
 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
@@ -16,8 +17,8 @@ DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1
 DIST qtwebengine-everywhere-src-6.6.0.tar.xz 421117212 BLAKE2B b168913644e07d3d649082a78a03ccfb135960ea61907046f3e16c28471a9684aca4685ea907ed47a27719647ae0d9c753d4faa9e24c9897e88dad24b08bd774 SHA512 30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366
 EBUILD qtwebengine-5.15.11_p20231102.ebuild 8842 BLAKE2B bbdb24b4a938e8fee8c8ef6de378af1384f553ff9412e4567d53374159555fde948eb85f9ebfd3786c3d7afc03b15af7938d4093041c08f44841172480f6665f SHA512 51c010763e75108c4bd74f04eb1845ef4d8e8d2822cace976ecf7e3e13f00448d1e529f360dead5f6be0addc00e5888b4d2d87174c0ec3a516caf28fa59e4972
 EBUILD qtwebengine-5.15.11_p20231120.ebuild 8976 BLAKE2B 1adc0e6d30ddaea9a90ecd59ce1ccd05b448e5bb0b8e75a5b3ae20b2e262d7a73ddbc248e4638500fe43a4441584f4a1a62b2d67cdcc2b84476bac389c48e5bb SHA512 01bc61459b5d2e88cb7745975a1ed348f4a578843444f070103e89786ce72d7f895a8077d6e794a7e7ce29d60a88f8dcf0fbbbbffffc125a78b10176526d5fe9
-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 721e4daaa7183fea52087f1fd6894766f266c36fbe2354fa0931e3605b6e5a88c53ae0310408af7d8fa188a91d2cc07d2510e99df3efdf6b1d500ecf833307d4 SHA512 9f618d9e6b3e5ff0b24da9379dbdc2e22a30c0b6e0cea0b2dde9d165fd8915b7afb5ebb45f6bdd3e7af1ea3938ce952c7c8c5edaa601b36f620f1e756cf5c16d
-EBUILD qtwebengine-6.9999.ebuild 8587 BLAKE2B dee409e7d36d0543334a0a2833efb7c48ab77f6cc36cf46e2a05b87e59bf6a0f2457ab5b3e4231daea3c4607ba0a39ca862c11cb9ab41dfc99f672499fec6c66 SHA512 e6d62be4a506bbe93c00438adec2a55254849abe1dbbc23a351b3b52bbcb633d5888daba943e7422868d9cd893daca53f56e63e71d0ca682fbad5cf05d3fba56
+EBUILD qtwebengine-6.5.3.ebuild 8377 BLAKE2B 142df363b738563779daae7f19174d0c6c6bb00fbb2327a68b8303a37462bfc8313bd8dbca5c41536c3b012cab19d8d946f234f06321284dbe740695dcee04ce SHA512 72f97e4659a2af838db1baf1c530ff7b8d74beaa89240538246362757ff6b02871afc324d015c38fff19ed08d61a4509816d2b234316c8c60298217d73d7b134
+EBUILD qtwebengine-6.6.0.ebuild 8669 BLAKE2B 88863750c8cdc25e352e890e478612e1891c3d9084f8a60c215c03bc921009236c7c523180a87b7acf255bd805e7577f39e4113397f623fbf3eb95a440eed17c SHA512 9603c33d114390766fdd5d0b0d5135423bc8000813f0ca2b076edee39305e698bdfd1146bc2e6d11fecfd99b677c3b29f547a3ebde34d9665f71ee46e0e36b0a
+EBUILD qtwebengine-6.6.9999.ebuild 8701 BLAKE2B 679fa8d7e1ddecd2da6154f571d09a85bd9e5cfbc706642495b6360ff7f769d755e2a16f5ca003d63a68f65d22f865f7ff80996739ef16158bec3146f0194e1e SHA512 a0d69e082cbbb610d4b495ca584b491c0cc9ce1eff7935233b5035549337efa39a459853b4a4975d48481a8dee557e7487c80cf1d2abb3527bd71770c6f063c4
+EBUILD qtwebengine-6.9999.ebuild 8616 BLAKE2B 7093e4d8276df8d9743656ebce40c7a6dc87ee308255edc92d78a22a16b368f2f6649cfcd6e1d79fe889f76fd08eb02ad0e38e249092c1f8d9e1bbab50eda51a SHA512 583e69b6bf328f83147b2b29552957afd6217c3e0665f24a3c156dcb8f2a62ec05df54cd6928461cc12f64568c5a60a51931867a853e015bee67127462134b28
 MISC metadata.xml 1312 BLAKE2B 4473aad7240926735bbabbeaeff862f3bc253c3e79e09086c17fb9b603ba5e9dc25ecbbc423a60a344bf471e11634c9b4728222e66f3d19022e3f3d2c9cc2f60 SHA512 797e67cf05a37dcb5ad5712cabef051b4a8f5dcb9601b627bcf029e4c99d0a09fa62b03cb9dcb64b5b6e5f29104e72711136d4c9aa79928c34f6bfe212742e2d
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch
new file mode 100644
index 000000000000..d725f3209106
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch
@@ -0,0 +1,39 @@
+Patch status: fixed in >=chromium-121.0.6104.0 with caveat
+
+Fix build failure[1] with libxml2-2.12 due xmlError changes.
+
+For convenience, use LIBXML_VERSION like webkit did[2] rather than
+chromium's upstream fix[3] which relies on bundled libxml2 always
+being 2.12.x (spares having to use has_version).
+
+When fix lands in qtwebengine, will need to depend on >=libxml2-2.12
+unless Qt decides to do something different considering that cmake
+uses system libxml2 by default and it may be too early to enforce it.
+
+[1] https://bugs.gentoo.org/917601
+[2] https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
+[3] https://crrev.com/871f8ae9b65ce2679b0bc0be36902d65edf0c1e4
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
+@@ -78,5 +78,9 @@
+   void reset();
+ 
++#if LIBXML_VERSION >= 21200
++  static void ParseErrorFunc(void* user_data, const xmlError*);
++#else
+   static void ParseErrorFunc(void* user_data, xmlError*);
++#endif
+   static void GenericErrorFunc(void* user_data, const char* msg, ...);
+ 
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
+@@ -67,5 +67,9 @@
+ }
+ 
++#if LIBXML_VERSION >= 21200
++void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
++#else
+ void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
++#endif
+   FrameConsole* console = static_cast<FrameConsole*>(user_data);
+   if (!console)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index 41ccab685127..bdf9b8771048 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -104,6 +104,7 @@ PATCHES+=(
 	"${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
 	"${FILESDIR}"/${PN}-6.5.2-cstdint.patch
 	"${FILESDIR}"/${PN}-6.5.3-icu74.patch
+	"${FILESDIR}"/${PN}-6.5.3-libxml2-2.12.patch
 )
 
 python_check_deps() {
@@ -194,7 +195,7 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# preemptively using bundled to avoid complications, may revisit
+		# use bundled re2 to avoid complications, may revisit
 		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
 		-DQT_FEATURE_webengine_system_re2=OFF
 
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
index 234c81fd1039..0ec96bb955e3 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
@@ -112,6 +112,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
+	"${FILESDIR}"/${PN}-6.5.3-libxml2-2.12.patch
 )
 
 python_check_deps() {
@@ -203,7 +204,7 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# preemptively using bundled to avoid complications, may revisit
+		# use bundled re2 to avoid complications, may revisit
 		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
 		-DQT_FEATURE_webengine_system_re2=OFF
 
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index b5b6023bdcaf..a9ffd7a62755 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -112,6 +112,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
+	"${FILESDIR}"/${PN}-6.5.3-libxml2-2.12.patch
 )
 
 python_check_deps() {
@@ -173,6 +174,7 @@ src_configure() {
 		$(qt_feature pdfium qtpdf_build)
 		$(qt_feature qml qtpdf_quick_build)
 		$(qt_feature widgets qtpdf_widgets_build)
+		$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
 
 		-DQT_FEATURE_qtwebengine_build=ON
 		$(qt_feature qml qtwebengine_quick_build)
@@ -203,7 +205,7 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# preemptively using bundled to avoid complications, may revisit
+		# use bundled re2 to avoid complications, may revisit
 		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
 		-DQT_FEATURE_webengine_system_re2=OFF
 
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index b44e003cb94e..09fe7ac6df06 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -172,6 +172,7 @@ src_configure() {
 		$(qt_feature pdfium qtpdf_build)
 		$(qt_feature qml qtpdf_quick_build)
 		$(qt_feature widgets qtpdf_widgets_build)
+		$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
 
 		-DQT_FEATURE_qtwebengine_build=ON
 		$(qt_feature qml qtwebengine_quick_build)
@@ -202,7 +203,7 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# preemptively using bundled to avoid complications, may revisit
+		# use bundled re2 to avoid complications, may revisit
 		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
 		-DQT_FEATURE_webengine_system_re2=OFF