Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt5-qtwebengine for openSUSE:Factory checked in at 2024-04-21 20:25:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebengine (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebengine" Sun Apr 21 20:25:12 2024 rev:96 rq:1169239 version:5.15.16 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebengine/libqt5-qtwebengine.changes 2024-03-09 20:55:03.063393816 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.26366/libqt5-qtwebengine.changes 2024-04-21 20:25:54.182887548 +0200 @@ -1,0 +2,6 @@ +Fri Apr 19 14:57:37 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Add patch to fix build with libxml >= 2.12: + * 0001-Fix-building-with-system-libxml2.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-building-with-system-libxml2.patch BETA DEBUG BEGIN: New:- Add patch to fix build with libxml >= 2.12: * 0001-Fix-building-with-system-libxml2.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebengine.spec ++++++ --- /var/tmp/diff_new_pack.sprhG4/_old 2024-04-21 20:25:57.090994254 +0200 +++ /var/tmp/diff_new_pack.sprhG4/_new 2024-04-21 20:25:57.090994254 +0200 @@ -62,6 +62,8 @@ Patch6: sandbox_futex_time64.patch # PATCH-FIX-UPSTREAM -- python 3.11 fixes 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-FIX-OPENSUSE -- allow building qtwebengine with ffmpeg5 Patch50: qtwebengine-ffmpeg5.patch @@ -297,6 +299,7 @@ %patch -P5 -p1 %patch -P6 -p1 %patch -P7 -p1 +%patch -P8 -p1 # Replace the whole catapult folder rather than picking individual changes pushd src/3rdparty/chromium/third_party ++++++ 0001-Fix-building-with-system-libxml2.patch ++++++ >From 159dff274a7f32f9b53711df6a5b6fbae8c64b4a Mon Sep 17 00:00:00 2001 From: Martin Negyokru <negyo...@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.jen...@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
