commit 36b6ffac7cfdd6e9cf486900e3c68631e61b3009
Author: Jan Palus <at...@pld-linux.org>
Date: Thu May 25 02:09:12 2023 +0200
up to 6.5.1
QTBUG-113109.patch | 115 -----------------------------------------------------
qt6.spec | 27 ++-----------
2 files changed, 4 insertions(+), 138 deletions(-)
---
diff --git a/qt6.spec b/qt6.spec
index 0d66677..2315348 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -106,19 +106,18 @@
Summary: Qt6 Library
Summary(pl.UTF-8): Biblioteka Qt6
Name: qt6
-Version: 6.5.0
-Release: 4
+Version: 6.5.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.5/%{version}/single/qt-everywhere-src-%{version}.tar.xz
-# Source0-md5: 10247444e4264ea9cee7d4a7c13efd34
+# Source0-md5: 4c1ec00f50833bc3c74d372d2ca6b556
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-113109.patch
URL: https://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: EGL-devel
@@ -2390,22 +2389,11 @@ Narzędzia Qt6 Quick Effect Maker.
%package -n Qt6QuickEffectMaker
Summary: Qt6 Quick Effect Maker
Group: Development/Libraries
+Obsoletes: Qt6QuickEffectMaker-devel < 6.5.1
%description -n Qt6QuickEffectMaker
Qt6 Quick Effect Maker.
-%package -n Qt6QuickEffectMaker-devel
-Summary: Qt6 Quick Effect Maker - development files
-Summary(pl.UTF-8): Qt6 Quick Effect Maker - pliki programistyczne
-Group: Development/Libraries
-Requires: Qt6Core-devel = %{version}
-
-%description -n Qt6QuickEffectMaker-devel
-Qt6 Quick Effect Maker - development files.
-
-%description -n Qt6QuickEffectMaker-devel -l pl.UTF-8
-Qt6 Quick Effect Maker - pliki programistyczne.
-
%package -n Qt6RemoteObjects
Summary: The Qt6 RemoteObjects library
Summary(pl.UTF-8): Biblioteka Qt6 RemoteObjects
@@ -3586,9 +3574,6 @@ narzędzia.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-cd qtwebengine
-%patch6 -p1
-cd ..
%{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf
@@ -6389,10 +6374,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{qt6dir}/qml/QtQuickEffectMaker
-%files -n Qt6QuickEffectMaker-devel
-%defattr(644,root,root,755)
-%{_libdir}/cmake/Qt6QQEffectMakerTools
-
%files -n qt6-quickeffectmaker
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/qqem-qt6
diff --git a/QTBUG-113109.patch b/QTBUG-113109.patch
deleted file mode 100644
index 2f84b60..0000000
--- a/QTBUG-113109.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 22ab520f5457a5272d904ac23cfb29ca6aca27d2 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jen...@qt.io>
-Date: Mon, 24 Apr 2023 17:33:17 +0200
-Subject: [PATCH] Fix user script management when subframes are present
-
-Only the main frames should administer scripts associated with it.
-
-Pick-to: 6.5
-Fixes: QTBUG-113109
-Change-Id: Ibda66f55ef99da632134a9de1425797262faba9b
----
-
-diff --git a/src/core/renderer/user_resource_controller.cpp
b/src/core/renderer/user_resource_controller.cpp
-index c49ecd3..ce942e0 100644
---- a/src/core/renderer/user_resource_controller.cpp
-+++ b/src/core/renderer/user_resource_controller.cpp
-@@ -289,10 +289,11 @@
- FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(renderFrame);
- if (it == m_frameUserScriptMap.end()) // ASSERT maybe?
- return;
-- for (uint64_t id : std::as_const(it.value())) {
-- m_scripts.remove(id);
-+ if (renderFrame->IsMainFrame()) {
-+ for (uint64_t id : std::as_const(it.value()))
-+ m_scripts.remove(id);
- }
-- m_frameUserScriptMap.remove(renderFrame);
-+ m_frameUserScriptMap.erase(it);
- }
-
- void UserResourceController::addScriptForFrame(const
QtWebEngineCore::UserScriptData &script,
-@@ -304,7 +305,8 @@
-
- if (!(*it).contains(script.scriptId))
- (*it).append(script.scriptId);
-- m_scripts.insert(script.scriptId, script);
-+ if (!frame || frame->IsMainFrame())
-+ m_scripts.insert(script.scriptId, script);
- }
-
- void UserResourceController::removeScriptForFrame(const
QtWebEngineCore::UserScriptData &script,
-@@ -315,7 +317,8 @@
- return;
-
- (*it).removeOne(script.scriptId);
-- m_scripts.remove(script.scriptId);
-+ if (!frame || frame->IsMainFrame())
-+ m_scripts.remove(script.scriptId);
- }
-
- void UserResourceController::clearScriptsForFrame(content::RenderFrame *frame)
-@@ -323,8 +326,10 @@
- FrameUserScriptMap::iterator it = m_frameUserScriptMap.find(frame);
- if (it == m_frameUserScriptMap.end())
- return;
-- for (uint64_t id : std::as_const(it.value()))
-- m_scripts.remove(id);
-+ if (!frame || frame->IsMainFrame()) {
-+ for (uint64_t id : std::as_const(it.value()))
-+ m_scripts.remove(id);
-+ }
-
- m_frameUserScriptMap.remove(frame);
- }
-diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
-index ed12fdb..9ba1358 100644
---- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
-+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
-@@ -76,6 +76,7 @@
- void scriptsInNestedIframes();
- void matchQrcUrl();
- void injectionOrder();
-+ void reloadWithSubframes();
- };
-
- void tst_QWebEngineScript::domEditing()
-@@ -694,6 +695,38 @@
- QTRY_COMPARE(page.log, expected);
- }
-
-+void tst_QWebEngineScript::reloadWithSubframes()
-+{
-+ class Page : public QWebEnginePage
-+ {
-+ public:
-+ Page() : QWebEnginePage() {}
-+ QVector<QString> log;
-+
-+ protected:
-+ void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel, const
QString &message, int,
-+ const QString &) override
-+ {
-+ log.append(message);
-+ }
-+ } page;
-+
-+ QWebEngineScript s;
-+ s.setInjectionPoint(QWebEngineScript::DocumentCreation);
-+ s.setSourceCode(QStringLiteral("console.log('Hello');"));
-+ page.scripts().insert(s);
-+
-+ page.setHtml(QStringLiteral("<body>"
-+ " <h1>Test scripts working on reload </h1>"
-+ " <iframe src='about://blank'>"
-+ " </iframe>"
-+ "</body>"));
-+ QTRY_COMPARE(page.log.size(), 1);
-+
-+ page.triggerAction(QWebEnginePage::Reload);
-+ QTRY_COMPARE(page.log.size(), 2);
-+}
-+
- QTEST_MAIN(tst_QWebEngineScript)
-
- #include "tst_qwebenginescript.moc"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/36b6ffac7cfdd6e9cf486900e3c68631e61b3009
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
