qt6 new package

2022-10-08 21:29:58 +03:00
parent fce9a4cecb
commit 136b1ff12e
140 changed files with 13061 additions and 38 deletions
@@ -0,0 +1,12 @@
+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 {
@@ -0,0 +1,16 @@
+#!/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
@@ -0,0 +1,33 @@
+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
+