Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dqt6-6.6.1

Browse Source
This commit is contained in:
Rmys
2023-11-28 22:52:09 +03:00
parent 8b8e224abf
commit 9a36b6db1b
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt6/qt6-webengine/files/libxml-2.12.patch
+28 -15
View File
@@ -1,26 +1,39 @@
diff --git 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 Patch status: fixed in >=chromium-121.0.6104.0 with caveat
index d53835e9675793..2eaea31ed29b90 100644
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 --- 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 +++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable { @@ -78,5 +78,9 @@
void reset(); void reset();
- static void ParseErrorFunc(void* user_data, xmlError*); +#if LIBXML_VERSION >= 21200
+ static void ParseErrorFunc(void* user_data, const xmlError*); + 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, ...); static void GenericErrorFunc(void* user_data, const char* msg, ...);
// Only for libXSLT callbacks
diff --git 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
index 133e0b3355d2f0..f424077089da87 100644
--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc --- 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 +++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { @@ -67,5 +67,9 @@
// It would be nice to do something with this error message.
} }
-void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { +#if LIBXML_VERSION >= 21200
+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { +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); FrameConsole* console = static_cast<FrameConsole*>(user_data);
if (!console) if (!console)
return;