commit af9915db9ab37ec3a911098bf200d7ae43417db2
Author: Jan Palus <at...@pld-linux.org>
Date: Thu Sep 28 23:17:58 2023 +0200
up to 6.5.3
QTBUG-113251.patch | 54 --------------------------------------------------
QTBUG-115976.patch | 39 ------------------------------------
no-implicit-sse2.patch | 2 +-
qt6.spec | 16 ++++++---------
4 files changed, 7 insertions(+), 104 deletions(-)
---
diff --git a/qt6.spec b/qt6.spec
index 58cf6e5..1012480 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -106,20 +106,18 @@
Summary: Qt6 Library
Summary(pl.UTF-8): Biblioteka Qt6
Name: qt6
-Version: 6.5.2
-Release: 3
+Version: 6.5.3
+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.5/%{version}/single/qt-everywhere-src-%{version}.tar.xz
-# Source0-md5: 87f56fd8aedd2e429047c40397e9be48
+# Source0-md5: 755db0527410df135609b51defa1a689
Patch0: system-cacerts.patch
Patch1: ninja-program.patch
Patch2: %{name}-gn.patch
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
@@ -3606,8 +3604,6 @@ narzędzia.
%patch3 -p1
%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
@@ -3853,9 +3849,9 @@ cd -
install -d $RPM_BUILD_ROOT%{_examplesdir}/qt6
for dir in qt* ; do
- [ -d $dir/examples ] || continue
- mkdir -p $RPM_BUILD_ROOT%{_examplesdir}/qt6/$dir
- cp -a $dir/examples/* $RPM_BUILD_ROOT%{_examplesdir}/qt6/$dir/
+ [ -d $dir/examples ] || continue
+ mkdir -p $RPM_BUILD_ROOT%{_examplesdir}/qt6/$dir
+ cp -a $dir/examples/* $RPM_BUILD_ROOT%{_examplesdir}/qt6/$dir/
done
# find_lang --with-qm supports only PLD qt3/qt4 specific
%{_localedir}/*/LC_MESSAGES layout
diff --git a/QTBUG-113251.patch b/QTBUG-113251.patch
deleted file mode 100644
index 67d68e1..0000000
--- a/QTBUG-113251.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 381175792f1d3b7ef55cea40ec4f0d48f501e9a4 Mon Sep 17 00:00:00 2001
-From: Martin Negyokru <negyo...@inf.u-szeged.hu>
-Date: Fri, 28 Apr 2023 17:37:24 +0200
-Subject: [PATCH] Fix devtools context menus
-
-Set devtools custom menus on 'OnLoadCompleted' event.
-This event should be triggered by the Js frontend
-not by WebContentsObserver.
-
-Fixes: QTBUG-113251
-Change-Id: I815d818c5867d0f1d160a962be5a41a762699e00
-Reviewed-by: Allan Sandfeld Jensen <allan.jen...@qt.io>
-(cherry picked from commit 1243b80433d4a18bc57cf43ab29d02e6007261f3)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_...@qt-project.org>
----
-
-diff --git a/src/core/devtools_frontend_qt.cpp
b/src/core/devtools_frontend_qt.cpp
-index 731414d..4ef8b35 100644
---- a/src/core/devtools_frontend_qt.cpp
-+++ b/src/core/devtools_frontend_qt.cpp
-@@ -162,7 +162,7 @@
- web_contents()->Focus();
- }
-
--void DevToolsFrontendQt::InspectElementCompleted()
-+void DevToolsFrontendQt::OnLoadCompleted()
- {
- m_bindings->CallClientMethod("DevToolsAPI", "setUseSoftMenu",
base::Value(true));
- }
-diff --git a/src/core/devtools_frontend_qt.h b/src/core/devtools_frontend_qt.h
-index 3b722c9..a4f1726 100644
---- a/src/core/devtools_frontend_qt.h
-+++ b/src/core/devtools_frontend_qt.h
-@@ -54,18 +54,18 @@
-
- // DevToolsUIBindings::Delegate overrides
- void ActivateWindow() override;
-- void InspectElementCompleted() override;
- void SetEyeDropperActive(bool active) override;
- void OpenInNewTab(const std::string &url) override;
- void InspectedContentsClosing() override;
-+ void OnLoadCompleted() override;
-
-+ void InspectElementCompleted() override{};
- void CloseWindow() override{};
- void Inspect(scoped_refptr<content::DevToolsAgentHost>) override{};
- void SetInspectedPageBounds(const gfx::Rect &) override{};
- void SetIsDocked(bool) override{};
- void SetWhitelistedShortcuts(const std::string &) override{};
- void OpenNodeFrontend() override{};
-- void OnLoadCompleted() override{};
- void ReadyForTest() override{};
- void ConnectionReady() override{};
- void SetOpenNewWindowForPopups(bool) override{};
diff --git a/QTBUG-115976.patch b/QTBUG-115976.patch
deleted file mode 100644
index b64b467..0000000
--- a/QTBUG-115976.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From abe27e1f0e7f752b9ad4d5c1a05ee50cc19a51aa Mon Sep 17 00:00:00 2001
-From: Martin Negyokru <negyo...@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{};
diff --git a/no-implicit-sse2.patch b/no-implicit-sse2.patch
index 4294362..418c205 100644
--- a/no-implicit-sse2.patch
+++ b/no-implicit-sse2.patch
@@ -1,7 +1,7 @@
--- qt-everywhere-src-6.5.2/qtbase/cmake/QtInternalTargets.cmake.orig
2023-07-19 17:30:07.482041879 +0200
+++ qt-everywhere-src-6.5.2/qtbase/cmake/QtInternalTargets.cmake
2023-07-19 17:36:34.820978372 +0200
@@ -348,47 +348,6 @@
- target_link_options(PlatformCommonInternal INTERFACE
"-Wl,--enable-new-dtags")
+ qt_internal_platform_link_options(PlatformCommonInternal INTERFACE
"-Wl,--enable-new-dtags")
endif()
-function(qt_get_implicit_sse2_genex_condition out_var)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/af9915db9ab37ec3a911098bf200d7ae43417db2
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
