[packages/qt6] upstream qtwebengine fix for closing devtools; rel 3
atler
atler at pld-linux.org
Tue Aug 15 14:18:36 CEST 2023
commit b1b077ae33399dee093e807e730f7b8dade9e50f
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Aug 15 13:25:26 2023 +0200
upstream qtwebengine fix for closing devtools; rel 3
upstream report: https://bugreports.qt.io/browse/QTBUG-115976
fixes: https://github.com/qutebrowser/qutebrowser/issues/7676
QTBUG-115976.patch | 39 +++++++++++++++++++++++++++++++++++++++
qt6.spec | 4 +++-
2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/qt6.spec b/qt6.spec
index dee3b16..49f914b 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -107,7 +107,7 @@ Summary: Qt6 Library
Summary(pl.UTF-8): Biblioteka Qt6
Name: qt6
Version: 6.5.2
-Release: 2
+Release: 3
License: LGPL v3 or GPL v2 or GPL v3 or commercial
Group: X11/Libraries
Source0: https://download.qt.io/official_releases/qt/6.5/%{version}/single/qt-everywhere-src-%{version}.tar.xz
@@ -119,6 +119,7 @@ Patch3: no-implicit-sse2.patch
Patch4: x32.patch
Patch5: qtwebengine-cmake-build-type.patch
Patch6: QTBUG-113251.patch
+Patch7: QTBUG-115976.patch
URL: https://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: EGL-devel
@@ -3577,6 +3578,7 @@ narzędzia.
%patch4 -p1
%patch5 -p1
%patch6 -p1 -d qtwebengine
+%patch7 -p1 -d qtwebengine
%{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf
diff --git a/QTBUG-115976.patch b/QTBUG-115976.patch
new file mode 100644
index 0000000..b64b467
--- /dev/null
+++ b/QTBUG-115976.patch
@@ -0,0 +1,39 @@
+From abe27e1f0e7f752b9ad4d5c1a05ee50cc19a51aa Mon Sep 17 00:00:00 2001
+From: Martin Negyokru <negyokru at inf.u-szeged.hu>
+Date: Thu, 10 Aug 2023 15:51:57 +0200
+Subject: [PATCH] Fix close button in devtools
+
+Handle CloseWindow call coming from DevtoolsUIBindings.
+
+Pick-to: 6.6
+Fixes: QTBUG-115976
+Change-Id: If58a96e3901234696c55c9c1402c645ba7a8576b
+---
+
+diff --git a/src/core/devtools_frontend_qt.cpp b/src/core/devtools_frontend_qt.cpp
+index 8c537a6..49fc0d3 100644
+--- a/src/core/devtools_frontend_qt.cpp
++++ b/src/core/devtools_frontend_qt.cpp
+@@ -209,4 +209,9 @@
+ web_contents()->ClosePage();
+ }
+
++void DevToolsFrontendQt::CloseWindow()
++{
++ web_contents()->Close();
++}
++
+ } // namespace QtWebEngineCore
+diff --git a/src/core/devtools_frontend_qt.h b/src/core/devtools_frontend_qt.h
+index a22bb05..ec7ccce 100644
+--- a/src/core/devtools_frontend_qt.h
++++ b/src/core/devtools_frontend_qt.h
+@@ -61,7 +61,7 @@
+ void OnLoadCompleted() override;
+
+ void InspectElementCompleted() override{};
+- void CloseWindow() override{};
++ void CloseWindow() override;
+ void Inspect(scoped_refptr<content::DevToolsAgentHost>) override{};
+ void SetInspectedPageBounds(const gfx::Rect &) override{};
+ void SetIsDocked(bool) override{};
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/b1b077ae33399dee093e807e730f7b8dade9e50f
More information about the pld-cvs-commit
mailing list