diff options
| author | Ionen Wolkens <ionen@gentoo.org> | 2023-12-19 14:40:48 -0500 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2023-12-19 15:31:20 -0500 |
| commit | 3baa4dfa3ad0fcc3ddabccb5af583672d19a005a (patch) | |
| tree | 177d8baaada3b4f559a8f1e162dca13c75d7fa1f /dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch | |
| parent | 56e465c0e4745b1f7efd4b195c7040195fd9c24e (diff) | |
| download | gentoo-3baa4dfa3ad0fcc3ddabccb5af583672d19a005a.tar.gz gentoo-3baa4dfa3ad0fcc3ddabccb5af583672d19a005a.tar.bz2 gentoo-3baa4dfa3ad0fcc3ddabccb5af583672d19a005a.zip | |
dev-qt/qtwebengine: drop 6.5.3
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch')
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch | 39 |
1 files changed, 0 insertions, 39 deletions
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 deleted file mode 100644 index d725f3209106..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch +++ /dev/null @@ -1,39 +0,0 @@ -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) |
