diff options
| author | Jan Kundrát <jkt@kde.org> | 2024-01-16 23:08:51 +0100 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2024-02-09 08:10:03 +0000 |
| commit | 2ad2987a9558ab913c42211fbd0fd78b612233f4 (patch) | |
| tree | c8c753320f804d99cc7dced43008915d776c2e57 /pkgs/development/libraries/qt-5 | |
| parent | 61c4f91c19e43a8cac382bc8af841e4ec4c01a0c (diff) | |
qt5.qtwebkit: apply libxml2 patch from upstream webkit
Without this patch, the build fails with the current libxml2:
/build/source/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp: In member function 'bool WebCore::XSLStyleSheet::parseString(const WTF::String&)':
/build/source/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp:148:129: error: invalid conversion from 'void (*)(void*, xmlError*)' {aka 'void (*)(void*, _xmlError*)'} to 'xmlStructuredErrorFunc' {aka 'void (*)(void*, const _xmlError*)'} [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-fpermissive-fpermissive8;;]
148 | XMLDocumentParserScope scope(cachedResourceLoader(), XSLTProcessor::genericErrorFunc, XSLTProcessor::parseErrorFunc, console);
| ^
| |
| void (*)(void*, xmlError*) {aka void (*)(void*, _xmlError*)}
In file included from /build/source/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp:33:
/build/source/Source/WebCore/xml/parser/XMLDocumentParserScope.h:48:99: note: initializing argument 3 of 'WebCore::XMLDocumentParserScope::XMLDocumentParserScope(WebCore::CachedResourceLoader*, xmlGenericErrorFunc, xmlStructuredErrorFunc, void*)'
48 | XMLDocumentParserScope(CachedResourceLoader*, xmlGenericErrorFunc, xmlStructuredErrorFunc structuredErrorFunc = 0, void* errorContext = nullptr);
| ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~
/build/source/Source/WebCore/xml/XSLTProcessorLibxslt.cpp: In function 'xmlDoc* WebCore::docLoaderFunc(const xmlChar*, xmlDictPtr, int, void*, xsltLoadType)':
/build/source/Source/WebCore/xml/XSLTProcessorLibxslt.cpp:147:34: error: invalid conversion from 'void (*)(void*, xmlError*)' {aka 'void (*)(void*, _xmlError*)'} to 'xmlStructuredErrorFunc' {aka 'void (*)(void*, const _xmlError*)'} [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-fpermissive-fpermissive8;;]
147 | xmlSetStructuredErrorFunc(console, XSLTProcessor::parseErrorFunc);
| ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| void (*)(void*, xmlError*) {aka void (*)(void*, _xmlError*)}
Bug: https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index ec3e3c634fb28..6334217f7458d 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -211,6 +211,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch"; sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE="; }) + (fetchpatch { + name = "qtwebkit-libxml2-api-change.patch"; + url = "https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch"; + sha256 = "WZEj+UuKhgJBM7auhND3uddk1wWdTY728jtiWVe7CSI="; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ./qtwebkit-cstdint.patch |