From 6de203bb03af0fb7ca90f1606c8cd8277d99a6fa5858c71c399b458785dc75c8 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 23 May 2024 08:31:39 +0000 Subject: [PATCH] Accepting request 1175612 from home:krop:Qt6:Release Qt 6.7.1 OBS-URL: https://build.opensuse.org/request/show/1175612 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-declarative?expand=0&rev=70 --- ...-rejecting-click-events-near-window-.patch | 39 ------------------- qt6-declarative.changes | 8 ++++ qt6-declarative.spec | 8 ++-- qtdeclarative-everywhere-src-6.7.0.tar.xz | 3 -- qtdeclarative-everywhere-src-6.7.1.tar.xz | 3 ++ 5 files changed, 14 insertions(+), 47 deletions(-) delete mode 100644 0001-Fix-PointHandler-rejecting-click-events-near-window-.patch delete mode 100644 qtdeclarative-everywhere-src-6.7.0.tar.xz create mode 100644 qtdeclarative-everywhere-src-6.7.1.tar.xz diff --git a/0001-Fix-PointHandler-rejecting-click-events-near-window-.patch b/0001-Fix-PointHandler-rejecting-click-events-near-window-.patch deleted file mode 100644 index 1deeae8..0000000 --- a/0001-Fix-PointHandler-rejecting-click-events-near-window-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9089292c495970b00728398f49e8f66bab1f4f32 Mon Sep 17 00:00:00 2001 -From: Fushan Wen -Date: Sat, 16 Mar 2024 02:58:08 +0800 -Subject: [PATCH] Fix PointHandler rejecting click events near window edge with - HiDPI - -When using HiDPI and a click happens near the window edge, the global -position might have fractional parts, but after the global position is -converted to QPoint, the position can be rounded so it happens to stay -at the window edge, so the window geometry will not contain the rounded -position. - -Related bugreport: https://bugs.kde.org/show_bug.cgi?id=482580 - -Pick-to: 6.6 6.7 -Change-Id: I51a26f955fd58f2a135c64ceb32ee881a03fcaf8 -Reviewed-by: Shawn Rutledge ---- - src/quick/handlers/qquickpointerhandler.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp -index c01cbd039fd..a29c8ae2d32 100644 ---- a/src/quick/handlers/qquickpointerhandler.cpp -+++ b/src/quick/handlers/qquickpointerhandler.cpp -@@ -560,10 +560,10 @@ bool QQuickPointerHandler::parentContains(const QPointF &scenePosition) const - { - if (QQuickItem *par = parentItem()) { - if (par->window()) { -- QRect windowGeometry = par->window()->geometry(); -+ QRectF windowGeometry = par->window()->geometry(); - if (!par->window()->isTopLevel()) -- windowGeometry = QRect(QWindowPrivate::get(par->window())->globalPosition(), par->window()->size()); -- QPoint screenPosition = par->window()->mapToGlobal(scenePosition.toPoint()); -+ windowGeometry = QRectF(QWindowPrivate::get(par->window())->globalPosition(), par->window()->size()); -+ QPointF screenPosition = par->window()->mapToGlobal(scenePosition); - if (!windowGeometry.contains(screenPosition)) - return false; - } diff --git a/qt6-declarative.changes b/qt6-declarative.changes index bb52c27..31eb5d8 100644 --- a/qt6-declarative.changes +++ b/qt6-declarative.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 21 08:31:28 UTC 2024 - Christophe Marin + +- Update to 6.7.1: + * https://www.qt.io/blog/qt-6.7.1-released +- Drop patch, merged upstream: + * 0001-Fix-PointHandler-rejecting-click-events-near-window-.patch + ------------------------------------------------------------------- Tue Apr 2 13:39:38 UTC 2024 - Christophe Marin diff --git a/qt6-declarative.spec b/qt6-declarative.spec index adccfd0..8e7f65c 100644 --- a/qt6-declarative.spec +++ b/qt6-declarative.spec @@ -16,7 +16,7 @@ # -%define real_version 6.7.0 +%define real_version 6.7.1 %define short_version 6.7 %define tar_name qtdeclarative-everywhere-src %define tar_suffix %{nil} @@ -27,17 +27,15 @@ %endif # Name: qt6-declarative%{?pkg_suffix} -Version: 6.7.0 +Version: 6.7.1 Release: 0 Summary: Qt 6 Declarative Libraries and tools License: GPL-2.0-only OR GPL-3.0-or-later OR LGPL-3.0-only URL: https://www.qt.io -Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz +Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-declarative-rpmlintrc # PATCH-FIX-OPENSUSE Patch0: 0001-qmlimportscanner-Include-module-versions-again.patch -# PATCH-FIX-UPSTREAM kde#482580 -Patch3: 0001-Fix-PointHandler-rejecting-click-events-near-window-.patch BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: qt6-core-private-devel diff --git a/qtdeclarative-everywhere-src-6.7.0.tar.xz b/qtdeclarative-everywhere-src-6.7.0.tar.xz deleted file mode 100644 index 961c883..0000000 --- a/qtdeclarative-everywhere-src-6.7.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c -size 35360444 diff --git a/qtdeclarative-everywhere-src-6.7.1.tar.xz b/qtdeclarative-everywhere-src-6.7.1.tar.xz new file mode 100644 index 0000000..4db166c --- /dev/null +++ b/qtdeclarative-everywhere-src-6.7.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c +size 35624448