From 93087cdc05b1b67eea99e510576ab52fe7e9ce0b Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 28 Nov 2023 15:11:30 +0300 Subject: [PATCH] qt6-6.6.1 --- ...webengine-everywhere-src-5.15.5-TRUE.patch | 12 ----- .../files/fedora/qtwebengine-release.sh | 16 ------- .../qt6/qt6-webengine/files/libxml-2.12.patch | 26 ++++++++++ .../qt6-webengine/files/qtbug-107144.patch | 33 ------------- desktop/toolkit/qt6/qt6-webengine/pspec.xml | 47 +++++++++++-------- 5 files changed, 53 insertions(+), 81 deletions(-) delete mode 100644 desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch delete mode 100644 desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-release.sh create mode 100644 desktop/toolkit/qt6/qt6-webengine/files/libxml-2.12.patch delete mode 100644 desktop/toolkit/qt6/qt6-webengine/files/qtbug-107144.patch diff --git a/desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch b/desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch deleted file mode 100644 index 10a93246d9..0000000000 --- a/desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c ---- qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE 2021-05-28 07:05:45.000000000 -0500 -+++ qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2021-06-24 09:44:41.592468805 -0500 -@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler - #ifdef LIBXML_ICU_ENABLED - else if (handler->uconv_out != NULL) { - ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, -- TRUE); -+ 1); - } - #endif /* LIBXML_ICU_ENABLED */ - else { diff --git a/desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-release.sh b/desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-release.sh deleted file mode 100644 index a7b59e72fb..0000000000 --- a/desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-release.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -x -VERSION=5.15.5 -CHROMIUMHASH=`wget https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/3rdparty?h=$VERSION -q --content-on-error -O - | grep "Bad object name: " | sed 's/^.*Bad object name: \([0-9a-f]\{40\}\).*$/\1/g'` -rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-opensource-src-$VERSION -wget https://github.com/qt/qtwebengine/archive/$VERSION.tar.gz -O qtwebengine-$VERSION.tar.gz || exit $? -tar xzf qtwebengine-$VERSION.tar.gz || exit $? -wget https://github.com/qt/qtwebengine-chromium/archive/$CHROMIUMHASH.tar.gz -O qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $? -tar xzf qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $? -mv qtwebengine-$VERSION qtwebengine-everywhere-opensource-src-$VERSION || exit $? -cd qtwebengine-everywhere-opensource-src-$VERSION ; syncqt.pl -version $VERSION || exit $? -rmdir ../qtwebengine-everywhere-opensource-src-$VERSION/src/3rdparty || exit $? -mv ../qtwebengine-chromium-$CHROMIUMHASH src/3rdparty || exit $? -# cd .. -# XZ_OPT=-9 tar cJf qtwebengine-everywhere-opensource-src-$VERSION.tar.xz qtwebengine-everywhere-opensource-src-$VERSION || exit $? -# rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-opensource-src-$VERSION diff --git a/desktop/toolkit/qt6/qt6-webengine/files/libxml-2.12.patch b/desktop/toolkit/qt6/qt6-webengine/files/libxml-2.12.patch new file mode 100644 index 0000000000..057a7c82ce --- /dev/null +++ b/desktop/toolkit/qt6/qt6-webengine/files/libxml-2.12.patch @@ -0,0 +1,26 @@ +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 d53835e9675793..2eaea31ed29b90 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 +@@ -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 +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 133e0b3355d2f0..f424077089da87 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 +@@ -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(user_data); + if (!console) + return; diff --git a/desktop/toolkit/qt6/qt6-webengine/files/qtbug-107144.patch b/desktop/toolkit/qt6/qt6-webengine/files/qtbug-107144.patch deleted file mode 100644 index d7faa5a2b6..0000000000 --- a/desktop/toolkit/qt6/qt6-webengine/files/qtbug-107144.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 64b7da9dab82713fdcb2e03d8a2715421eae5685 Mon Sep 17 00:00:00 2001 -From: Martin Negyokru -Date: Mon, 3 Oct 2022 12:20:00 +0200 -Subject: Do not intercept websocket connection when there is no associated - frame - -This fix is based on chrome's implementation. - -Fixes: QTBUG-107144 -Pick-to: 6.4 -Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d -Reviewed-by: Allan Sandfeld Jensen ---- - src/core/content_browser_client_qt.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp -index a1868715c..b6e6748c8 100644 ---- a/src/core/content_browser_client_qt.cpp -+++ b/src/core/content_browser_client_qt.cpp -@@ -1245,8 +1245,7 @@ ContentBrowserClientQt::WillCreateURLLoaderRequestInterceptors(content::Navigati - - bool ContentBrowserClientQt::WillInterceptWebSocket(content::RenderFrameHost *frame) - { -- Q_UNUSED(frame); -- return true; // It is probably not worth it to only intercept when interceptors are installed -+ return frame != nullptr; - } - - QWebEngineUrlRequestInterceptor *getProfileInterceptorFromFrame(content::RenderFrameHost *frame) --- -cgit v1.2.1 - diff --git a/desktop/toolkit/qt6/qt6-webengine/pspec.xml b/desktop/toolkit/qt6/qt6-webengine/pspec.xml index 0e31d041f2..7add6f2eaf 100755 --- a/desktop/toolkit/qt6/qt6-webengine/pspec.xml +++ b/desktop/toolkit/qt6/qt6-webengine/pspec.xml @@ -12,23 +12,23 @@ Provides support for web applications using the Chromium browser project LGPLv2.1-linking-exception qt-logo - https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/qtwebengine-everywhere-src-6.6.0.tar.xz + https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtwebengine-everywhere-src-6.6.1.tar.xz ninja cmake - qt6-base-devel - qt6-declarative-devel - - qt6-positioning-devel - qt6-sensors-devel - qt6-webchannel-devel - qt6-designer-devel - qt6-websockets-devel + qt6-base-devel + qt6-declarative-devel + + qt6-positioning-devel + qt6-sensors-devel + qt6-webchannel-devel + qt6-designer-devel + qt6-websockets-devel bison wget tiff-devel cups-devel - nodejs + nodejs re2c ninja gperf @@ -93,7 +93,7 @@ - + libxml-2.12.patch @@ -135,7 +135,7 @@ libxslt libopus libxml2 - qt6-base + qt6-base alsa-lib harfbuzz libevent @@ -146,11 +146,11 @@ libXScrnSaver libXdamage libXrender - qt6-positioning + qt6-positioning libXcomposite libjpeg-turbo - qt6-webchannel - qt6-declarative + qt6-webchannel + qt6-declarative zlib minizip protobuf @@ -174,17 +174,17 @@ qt6-webengine - qt6-base-devel - qt6-declarative-devel - qt6-positioning-devel - qt6-webchannel-devel + qt6-base-devel + qt6-declarative-devel + qt6-positioning-devel + qt6-webchannel-devel + + 2023-11-28 + 6.6.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-11-17 6.6.0