pyrox.dev
lol
Merge pull request #278222 from K900/qtwebengine6-libxml-2.12
[staging-next] qt6.qtwebengine: fix build with libxml 2.12
+26
+4
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+4
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
···
131
131
132
132
# Override locales install path so they go to QtWebEngine's $out
133
133
../patches/qtwebengine-locales-path.patch
134
+
135
+
# Cherry-pick libxml 2.12 build fix
136
+
# FIXME: remove for 6.7
137
+
../patches/qtwebengine-libxml-2.12.patch
134
138
];
135
139
136
140
postPatch = ''
+22
pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch
+22
pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch
···
1
+
--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
2
+
+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
3
+
@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable {
4
+
5
+
void reset();
6
+
7
+
- static void ParseErrorFunc(void* user_data, xmlError*);
8
+
+ static void ParseErrorFunc(void* user_data, const xmlError*);
9
+
static void GenericErrorFunc(void* user_data, const char* msg, ...);
10
+
11
+
// Only for libXSLT callbacks
12
+
--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
13
+
+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
14
+
@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) {
15
+
// It would be nice to do something with this error message.
16
+
}
17
+
18
+
-void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
19
+
+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
20
+
FrameConsole* console = static_cast<FrameConsole*>(user_data);
21
+
if (!console)
22
+
return;