[packages/qt6] upstream fix for qtwebengine crash on github.com; rel 1

[atler]

commit 9222a87af15808932e1ea47311e7a0d4266a4d9d
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Nov 3 21:21:25 2022 +0100

    upstream fix for qtwebengine crash on github.com; rel 1
    
    see: https://bugreports.qt.io/browse/QTBUG-107144

 github-crash.patch | 34 ++++++++++++++++++++++++++++++++++
 qt6.spec           | 14 +++++++++-----
 2 files changed, 43 insertions(+), 5 deletions(-)
---
diff --git a/qt6.spec b/qt6.spec
index 540d86f..b27dd3e 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -93,7 +93,7 @@ Summary:	Qt6 Library
 Summary(pl.UTF-8):	Biblioteka Qt6
 Name:		qt6
 Version:	6.4.0
-Release:	0.1
+Release:	1
 License:	LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:		X11/Libraries
 Source0:	https://download.qt.io/official_releases/qt/6.4/%{version}/single/qt-everywhere-src-%{version}.tar.xz
@@ -104,6 +104,7 @@ Patch2:		%{name}-gn.patch
 Patch3:		no-implicit-sse2.patch
 Patch4:		x32.patch
 Patch5:		llvm15.patch
+Patch6:		github-crash.patch
 URL:		https://www.qt.io/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	EGL-devel
@@ -1216,7 +1217,7 @@ Requires:	Qt6WebSockets = %{version}
 %description -n Qt6HttpServer
 Qt6 HttpServer library provides HTTP server framework.
 
-%description -n Qt6HttpServer
+%description -n Qt6HttpServer -l pl.UTF-8
 Biblioteka Qt6 HttpServer dostarcza szkielet do budowy serwera HTTP.
 
 %package -n Qt6HttpServer-devel
@@ -2110,7 +2111,7 @@ Requires:	Qt6Quick3D = %{version}
 Qt6 Quick3DPhysics library provides a high-level API for physics
 simulation.
 
-%description -n Qt6Quick3DPhysics
+%description -n Qt6Quick3DPhysics -l pl.UTF-8
 Biblioteka Qt6 Quick3DPhysics dostarcza wysokpoziomowe API do
 symulacji fizycznych.
 
@@ -2504,7 +2505,7 @@ Requires:	Qt6Multimedia = %{version}
 Qt6 SpatialAudio library provides support for sound fields in 3D
 space.
 
-%description -n Qt6SpatialAudio
+%description -n Qt6SpatialAudio -l pl.UTF-8
 Biblioteka Qt6 SpatialAudio dostarcza wsparcia dla pól dźwiękowych w
 przestrzeni 3D.
 
@@ -2740,7 +2741,7 @@ Requires:	Qt6Qml = %{version}
 Qt6 TextToSpeech library enables text read out by using speech
 synthesis.
 
-%description -n Qt6TextToSpeech
+%description -n Qt6TextToSpeech -l pl.UTF-8
 Biblioteka Qt6 TextToSpeech umożliwia odczytywanie tekstu przy użyciu
 syntezatora mowy.
 
@@ -3349,6 +3350,9 @@ narzędzia.
 cd qttools
 %patch5 -p1
 cd ..
+cd qtwebengine
+%patch6 -p1
+cd ..
 
 %{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf
 
diff --git a/github-crash.patch b/github-crash.patch
new file mode 100644
index 0000000..d49470f
--- /dev/null
+++ b/github-crash.patch
@@ -0,0 +1,34 @@
+From 81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 Mon Sep 17 00:00:00 2001
+From: Martin Negyokru <negyokru at 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
+Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen at qt.io>
+(cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
+---
+ 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 020ae916a..99a3aa3f4 100644
+--- a/src/core/content_browser_client_qt.cpp
++++ b/src/core/content_browser_client_qt.cpp
+@@ -1237,8 +1237,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
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/9222a87af15808932e1ea47311e7a0d4266a4d9d