forked from pool/libqt5-qtwebengine
- Add patch to fix build with libxml >= 2.12:
* 0001-Fix-building-with-system-libxml2.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=62
This commit is contained in:
parent
bef0d81a28
commit
02d188ceae
53
0001-Fix-building-with-system-libxml2.patch
Normal file
53
0001-Fix-building-with-system-libxml2.patch
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
From 159dff274a7f32f9b53711df6a5b6fbae8c64b4a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Negyokru <negyokru@inf.u-szeged.hu>
|
||||||
|
Date: Thu, 7 Dec 2023 15:37:53 +0100
|
||||||
|
Subject: [PATCH] Fix building with system libxml2
|
||||||
|
|
||||||
|
Libxml2 2.12.0 has changed the const-ness of the
|
||||||
|
xmlError pointers, which results in a build error.
|
||||||
|
|
||||||
|
Pick-to: 112-based 108-based 87-based
|
||||||
|
Change-Id: Id86fcfbfe004f89109808b9bdb11c01133553884
|
||||||
|
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/523633
|
||||||
|
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||||
|
---
|
||||||
|
.../third_party/blink/renderer/core/xml/xslt_processor.h | 5 +++++
|
||||||
|
.../blink/renderer/core/xml/xslt_processor_libxslt.cc | 4 ++++
|
||||||
|
2 files changed, 9 insertions(+)
|
||||||
|
|
||||||
|
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
|
||||||
|
index d53835e9675..72536e4fd7d 100644
|
||||||
|
--- 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
|
||||||
|
@@ -79,7 +79,12 @@ class XSLTProcessor final : public ScriptWrappable {
|
||||||
|
|
||||||
|
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, ...);
|
||||||
|
|
||||||
|
// 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 133e0b3355d..e8e6a09f485 100644
|
||||||
|
--- 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
|
||||||
|
@@ -60,7 +60,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) {
|
||||||
|
// It would be nice to do something with this error message.
|
||||||
|
}
|
||||||
|
|
||||||
|
+#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)
|
||||||
|
return;
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 19 14:57:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add patch to fix build with libxml >= 2.12:
|
||||||
|
* 0001-Fix-building-with-system-libxml2.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Feb 24 11:06:56 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
Sat Feb 24 11:06:56 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
@ -62,6 +62,8 @@ Patch5: qtwebengine-python3.patch
|
|||||||
Patch6: sandbox_futex_time64.patch
|
Patch6: sandbox_futex_time64.patch
|
||||||
# PATCH-FIX-UPSTREAM -- python 3.11 fixes
|
# PATCH-FIX-UPSTREAM -- python 3.11 fixes
|
||||||
Patch7: python311-fixes.patch
|
Patch7: python311-fixes.patch
|
||||||
|
# PATCH-FIX-UPSTREAM -- libxml 2.12 support
|
||||||
|
Patch8: 0001-Fix-building-with-system-libxml2.patch
|
||||||
### Patch 50-99 are applied conditionally
|
### Patch 50-99 are applied conditionally
|
||||||
# PATCH-FIX-OPENSUSE -- allow building qtwebengine with ffmpeg5
|
# PATCH-FIX-OPENSUSE -- allow building qtwebengine with ffmpeg5
|
||||||
Patch50: qtwebengine-ffmpeg5.patch
|
Patch50: qtwebengine-ffmpeg5.patch
|
||||||
@ -297,6 +299,7 @@ Examples for the libqt5-qtpdf module.
|
|||||||
%patch -P5 -p1
|
%patch -P5 -p1
|
||||||
%patch -P6 -p1
|
%patch -P6 -p1
|
||||||
%patch -P7 -p1
|
%patch -P7 -p1
|
||||||
|
%patch -P8 -p1
|
||||||
|
|
||||||
# Replace the whole catapult folder rather than picking individual changes
|
# Replace the whole catapult folder rather than picking individual changes
|
||||||
pushd src/3rdparty/chromium/third_party
|
pushd src/3rdparty/chromium/third_party
|
||||||
|
Loading…
x
Reference in New Issue
Block a user