Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12991 from Rmys/master

Browse Source 
qt6-6.6.1
This commit is contained in:
Rmys
2023-11-28 15:12:06 +03:00
committed by GitHub
parent 6e0ecf52d2 93087cdc05
commit 48080b857e
5 changed files with 53 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch
-12
View File
@@ -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 {
desktop/toolkit/qt6/qt6-webengine/files/fedora/qtwebengine-release.sh
-16
View File
@@ -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
desktop/toolkit/qt6/qt6-webengine/files/libxml-2.12.patch
+26
View File
@@ -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<FrameConsole*>(user_data);
if (!console)
return;
desktop/toolkit/qt6/qt6-webengine/files/qtbug-107144.patch
-33
View File
@@ -1,33 +0,0 @@
From 64b7da9dab82713fdcb2e03d8a2715421eae5685 Mon Sep 17 00:00:00 2001
From: Martin Negyokru <negyokru@inf.u-szeged.hu>
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 <allan.jensen@qt.io>
---
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
desktop/toolkit/qt6/qt6-webengine/pspec.xml
+27 -20
View File
@@ -12,23 +12,23 @@
<Description>Provides support for web applications using the Chromium browser project</Description>
<License>LGPLv2.1-linking-exception</License>
<Icon>qt-logo</Icon>
<Archive sha1sum="d1c2b4eb1ea58213da544163e1e9ecaaff8c290c" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/qtwebengine-everywhere-src-6.6.0.tar.xz</Archive>
<Archive sha1sum="ea96fba5e409ddee7820d3aa6cd0c0af834e6a0b" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtwebengine-everywhere-src-6.6.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>ninja</Dependency>
<Dependency>cmake</Dependency>
<Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
<Dependency versionFrom="6.6.0">qt6-declarative-devel</Dependency>
<!-- <Dependency versionFrom="6.6.0">qt6-xmlpatterns-devel</Dependency> -->
<Dependency versionFrom="6.6.0">qt6-positioning-devel</Dependency>
<Dependency versionFrom="6.6.0">qt6-sensors-devel</Dependency>
<Dependency versionFrom="6.6.0">qt6-webchannel-devel</Dependency>
<Dependency versionFrom="6.6.0">qt6-designer-devel</Dependency>
<Dependency versionFrom="6.6.0">qt6-websockets-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-base-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-declarative-devel</Dependency>
<!-- <Dependency versionFrom="6.6.1">qt6-xmlpatterns-devel</Dependency> -->
<Dependency versionFrom="6.6.1">qt6-positioning-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-sensors-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-webchannel-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-designer-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-websockets-devel</Dependency>
<Dependency>bison</Dependency>
<Dependency>wget</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>cups-devel</Dependency>
<Dependency versionFrom="16.6.0">nodejs</Dependency>
<Dependency versionFrom="16.6.1">nodejs</Dependency>
<Dependency>re2c</Dependency>
<Dependency versionFrom="1.7.2">ninja</Dependency>
<Dependency>gperf</Dependency>
@@ -93,7 +93,7 @@
<!-- <Dependency>pciutils-devel</Dependency> -->
</BuildDependencies>
<Patches>
<!-- <Patch level="1">qtbug-107144.patch</Patch> -->
<Patch level="1">libxml-2.12.patch</Patch>
</Patches>
</Source>
@@ -135,7 +135,7 @@
<Dependency>libxslt</Dependency>
<Dependency>libopus</Dependency>
<Dependency>libxml2</Dependency>
<Dependency versionFrom="6.6.0">qt6-base</Dependency>
<Dependency versionFrom="6.6.1">qt6-base</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>libevent</Dependency>
@@ -146,11 +146,11 @@
<Dependency>libXScrnSaver</Dependency>
<Dependency>libXdamage</Dependency>
<Dependency>libXrender</Dependency>
<Dependency versionFrom="6.6.0">qt6-positioning</Dependency>
<Dependency versionFrom="6.6.1">qt6-positioning</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency versionFrom="6.6.0">qt6-webchannel</Dependency>
<Dependency versionFrom="6.6.0">qt6-declarative</Dependency>
<Dependency versionFrom="6.6.1">qt6-webchannel</Dependency>
<Dependency versionFrom="6.6.1">qt6-declarative</Dependency>
<Dependency>zlib</Dependency>
<Dependency>minizip</Dependency>
<Dependency>protobuf</Dependency>
@@ -174,17 +174,17 @@
</Files>
<RuntimeDependencies>
<Dependency release="current">qt6-webengine</Dependency>
<Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
<Dependency versionFrom="6.6.0">qt6-declarative-devel</Dependency>
<Dependency versionFrom="6.6.0">qt6-positioning-devel</Dependency>
<Dependency versionFrom="6.6.0">qt6-webchannel-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-base-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-declarative-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-positioning-devel</Dependency>
<Dependency versionFrom="6.6.1">qt6-webchannel-devel</Dependency>
</RuntimeDependencies>
</Package>
<!--Package>
<Name>qt6-webengine-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="6.6.0">qt6-base</Dependency>
<Dependency versionFrom="6.6.1">qt6-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
@@ -192,6 +192,13 @@
</Package-->
<History>
<Update release="7">
<Date>2023-11-28</Date>
<Version>6.6.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2023-11-17</Date>
<Version>6.6.0</Version>