gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #278222 from K900/qtwebengine6-libxml-2.12

Browse Source 
[staging-next] qt6.qtwebengine: fix build with libxml 2.12
This commit is contained in:
K900
2024-01-02 12:59:08 +03:00
committed by GitHub
parent 887e96e875 98ec8685a6
commit ce7c5efd68
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+4
View File
@@ -131,6 +131,10 @@ qtModule {
# Override locales install path so they go to QtWebEngine's $out
../patches/qtwebengine-locales-path.patch
# Cherry-pick libxml 2.12 build fix
# FIXME: remove for 6.7
../patches/qtwebengine-libxml-2.12.patch
];
postPatch = ''
pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch
+22
View File
@@ -0,0 +1,22 @@
--- 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
@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable {
void reset();
- static void ParseErrorFunc(void* user_data, xmlError*);
+ static void ParseErrorFunc(void* user_data, const xmlError*);
static void GenericErrorFunc(void* user_data, const char* msg, ...);
// Only for libXSLT callbacks
--- 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
@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) {
// It would be nice to do something with this error message.
}
-void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
FrameConsole* console = static_cast<FrameConsole*>(user_data);
if (!console)
return;