From b5fd240f42cb66efbc9d86bf577e087d9099cbf3 Mon Sep 17 00:00:00 2001 From: Heng Qi Date: Tue, 18 Apr 2023 10:49:28 +0800 Subject: [PATCH 1/2] Delete some redundacy patches Signed-off-by: Heng Qi --- ...-so-that-it-actually-registers-a-tap.patch | 73 ------------------- ...ndler-so-that-it-actually-registers-.patch | 61 ---------------- qt5-qtdeclarative.spec | 8 +- 3 files changed, 5 insertions(+), 137 deletions(-) delete mode 100644 0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch delete mode 100644 0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch diff --git a/0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch b/0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch deleted file mode 100644 index c49f6d2..0000000 --- a/0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch +++ /dev/null @@ -1,73 +0,0 @@ -From b8f474a4dd5fa58edfba73e565499bcdad679291 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= -Date: Thu, 3 Sep 2020 10:51:01 +0200 -Subject: [PATCH 06/21] Fix TapHandler so that it actually registers a tap - -This bug caused all quick examples that used the -shared\LauncherList.qml to be broken. - -In QtGui, QSinglePointEvent will construct itself with a point id of 0 -if there is a valid point, and with a point id of -1 if the point is -invalid (the default constructor does the latter). -However, QQuickSinglePointHandler::wantsPointerEvent() did not agree -with that, because it assumed that a point id of 0 meant -uninitialized/invalid point. -The fix is to change QQuickSinglePointHandler::wantsPointerEvent() and -QQuickHandlerPoint so that it assumes that the id -1 is now an invalid -point, (instead of 0) - -Change-Id: I8c9683dfe06ebb77c5342a26f08174b67e7cbd90 -Reviewed-by: Shawn Rutledge -(cherry picked from commit 8d3a91016506fd0afedb0be535f7c34a4ca762f6) ---- - src/quick/handlers/qquickhandlerpoint.cpp | 4 ++-- - src/quick/handlers/qquicksinglepointhandler.cpp | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/quick/handlers/qquickhandlerpoint.cpp b/src/quick/handlers/qquickhandlerpoint.cpp -index 72efdfd0f4..6aef3545dd 100644 ---- a/src/quick/handlers/qquickhandlerpoint.cpp -+++ b/src/quick/handlers/qquickhandlerpoint.cpp -@@ -82,7 +82,7 @@ void QQuickHandlerPoint::localize(QQuickItem *item) - - void QQuickHandlerPoint::reset() - { -- m_id = 0; -+ m_id = -1; - m_uniqueId = QPointingDeviceUniqueId(); - m_position = QPointF(); - m_scenePosition = QPointF(); -@@ -165,7 +165,7 @@ void QQuickHandlerPoint::reset(const QVector &points) - pressureSum += point.pressure(); - ellipseDiameterSum += point.ellipseDiameters(); - } -- m_id = 0; -+ m_id = -1; - m_uniqueId = QPointingDeviceUniqueId(); - // all points are required to be from the same event, so pressed buttons and modifiers should be the same - m_pressedButtons = points.first().pressedButtons(); -diff --git a/src/quick/handlers/qquicksinglepointhandler.cpp b/src/quick/handlers/qquicksinglepointhandler.cpp -index b51f53b74f..89081b4e84 100644 ---- a/src/quick/handlers/qquicksinglepointhandler.cpp -+++ b/src/quick/handlers/qquicksinglepointhandler.cpp -@@ -75,7 +75,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event) - if (!QQuickPointerDeviceHandler::wantsPointerEvent(event)) - return false; - -- if (d->pointInfo.id()) { -+ if (d->pointInfo.id() != -1) { - // We already know which one we want, so check whether it's there. - // It's expected to be an update or a release. - // If we no longer want it, cancel the grab. -@@ -125,7 +125,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event) - chosen->setAccepted(); - } - } -- return d->pointInfo.id(); -+ return d->pointInfo.id() != -1; - } - - void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event) --- -2.39.0 - diff --git a/0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch b/0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch deleted file mode 100644 index 413e137..0000000 --- a/0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch +++ /dev/null @@ -1,61 +0,0 @@ -From de04cfb654a09fe7d0f8454b8a8de9243284e1d2 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 16 Nov 2021 22:43:37 +0100 -Subject: [PATCH 07/21] Revert "Fix TapHandler so that it actually registers a - tap" - -This reverts commit 36e8ccd434f948e4f11a8f9d59139ec072e41ff5. - -It's causing regresions ---- - src/quick/handlers/qquickhandlerpoint.cpp | 4 ++-- - src/quick/handlers/qquicksinglepointhandler.cpp | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/quick/handlers/qquickhandlerpoint.cpp b/src/quick/handlers/qquickhandlerpoint.cpp -index 6aef3545dd..72efdfd0f4 100644 ---- a/src/quick/handlers/qquickhandlerpoint.cpp -+++ b/src/quick/handlers/qquickhandlerpoint.cpp -@@ -82,7 +82,7 @@ void QQuickHandlerPoint::localize(QQuickItem *item) - - void QQuickHandlerPoint::reset() - { -- m_id = -1; -+ m_id = 0; - m_uniqueId = QPointingDeviceUniqueId(); - m_position = QPointF(); - m_scenePosition = QPointF(); -@@ -165,7 +165,7 @@ void QQuickHandlerPoint::reset(const QVector &points) - pressureSum += point.pressure(); - ellipseDiameterSum += point.ellipseDiameters(); - } -- m_id = -1; -+ m_id = 0; - m_uniqueId = QPointingDeviceUniqueId(); - // all points are required to be from the same event, so pressed buttons and modifiers should be the same - m_pressedButtons = points.first().pressedButtons(); -diff --git a/src/quick/handlers/qquicksinglepointhandler.cpp b/src/quick/handlers/qquicksinglepointhandler.cpp -index 89081b4e84..b51f53b74f 100644 ---- a/src/quick/handlers/qquicksinglepointhandler.cpp -+++ b/src/quick/handlers/qquicksinglepointhandler.cpp -@@ -75,7 +75,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event) - if (!QQuickPointerDeviceHandler::wantsPointerEvent(event)) - return false; - -- if (d->pointInfo.id() != -1) { -+ if (d->pointInfo.id()) { - // We already know which one we want, so check whether it's there. - // It's expected to be an update or a release. - // If we no longer want it, cancel the grab. -@@ -125,7 +125,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event) - chosen->setAccepted(); - } - } -- return d->pointInfo.id() != -1; -+ return d->pointInfo.id(); - } - - void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event) --- -2.39.0 - diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index 9c9d7c4..b4dd7b7 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 4 %define _lto_cflags %{nil} %global majmin %(echo %{version} | cut -d. -f1-2) @@ -18,8 +18,6 @@ Patch2: 0002-Support-apos-in-styled-text.patch Patch3: 0003-Remove-unused-QPointer-QQuickPointerMask.patch Patch4: 0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch Patch5: 0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch -Patch6: 0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch -Patch7: 0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch Patch8: 0008-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch Patch9: 0009-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch Patch10: 0010-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch @@ -175,6 +173,10 @@ make check -k -C tests ||: %endif %changelog +* Tue Apr 18 2023 Heng Qi - 5.15.8-4 +- Delete the 0006-Fix-TapHandler-so-that-it-actually-registers-a-tap.patch + and 0007-Revert-Fix-TapHandler-so-that-it-actually-registers-.patch + * Fri Apr 14 2023 Jing Zhang - 5.15.8-3 - Refact spec -- Gitee From 766ba55798137fa606c4cf9d57f14018242b7f6d Mon Sep 17 00:00:00 2001 From: Heng Qi Date: Wed, 19 Apr 2023 16:15:23 +0800 Subject: [PATCH 2/2] Rename patches Signed-off-by: Heng Qi --- ...Array-fix-UB-precondition-violation-.patch | 0 ...dtor-of-an-object-we-continue-to-use.patch | 0 ...Widget-and-its-offscreen-window-s-sc.patch | 0 ...-against-cycles-in-nextPrevItemInTab.patch | 0 ...eFieldGlyphCache-fix-multiplication-.patch | 0 ...eFieldGlyphCache-fix-UB-ordering-of-.patch | 0 ...nges-if-currentChanges-is-active-whe.patch | 0 ...on-t-convert-QByteArray-in-startDrag.patch | 0 ...95290f66b806a307b8da1f72f8fc2c698019.patch | 0 ...ement-accessibility-for-QQuickWidget.patch | 0 ...event-for-visible-components-after-i.patch | 0 ...-emitting-signals-during-destruction.patch | 0 ...> 0018-a11y-track-item-enabled-state.patch | 0 ...e-QaccessibleQuickWidget-private-API.patch | 0 ...atch => 0020-qt5-qtdeclarative-gcc11.patch | 0 ...declarative-5.15.0-FixMaxXMaxYExtent.patch | 0 qt5-qtdeclarative.spec | 44 +++++++++---------- 17 files changed, 22 insertions(+), 22 deletions(-) rename 0008-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch => 0006-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch (100%) rename 0009-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch => 0007-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch (100%) rename 0010-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch => 0008-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch (100%) rename 0011-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch => 0009-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch (100%) rename 0012-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch => 0010-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch (100%) rename 0013-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch => 0011-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch (100%) rename 0014-Reset-currentChanges-if-currentChanges-is-active-whe.patch => 0012-Reset-currentChanges-if-currentChanges-is-active-whe.patch (100%) rename 0015-Don-t-convert-QByteArray-in-startDrag.patch => 0013-Don-t-convert-QByteArray-in-startDrag.patch (100%) rename 0016-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch => 0014-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch (100%) rename 0017-Implement-accessibility-for-QQuickWidget.patch => 0015-Implement-accessibility-for-QQuickWidget.patch (100%) rename 0018-Send-ObjectShow-event-for-visible-components-after-i.patch => 0016-Send-ObjectShow-event-for-visible-components-after-i.patch (100%) rename 0019-QQuickItem-avoid-emitting-signals-during-destruction.patch => 0017-QQuickItem-avoid-emitting-signals-during-destruction.patch (100%) rename 0020-a11y-track-item-enabled-state.patch => 0018-a11y-track-item-enabled-state.patch (100%) rename 0021-Make-QaccessibleQuickWidget-private-API.patch => 0019-Make-QaccessibleQuickWidget-private-API.patch (100%) rename qt5-qtdeclarative-gcc11.patch => 0020-qt5-qtdeclarative-gcc11.patch (100%) rename qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch => 0021-qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch (100%) diff --git a/0008-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch b/0006-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch similarity index 100% rename from 0008-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch rename to 0006-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch diff --git a/0009-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch b/0007-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch similarity index 100% rename from 0009-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch rename to 0007-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch diff --git a/0010-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch b/0008-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch similarity index 100% rename from 0010-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch rename to 0008-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch diff --git a/0011-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch b/0009-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch similarity index 100% rename from 0011-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch rename to 0009-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch diff --git a/0012-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch b/0010-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch similarity index 100% rename from 0012-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch rename to 0010-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch diff --git a/0013-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch b/0011-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch similarity index 100% rename from 0013-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch rename to 0011-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch diff --git a/0014-Reset-currentChanges-if-currentChanges-is-active-whe.patch b/0012-Reset-currentChanges-if-currentChanges-is-active-whe.patch similarity index 100% rename from 0014-Reset-currentChanges-if-currentChanges-is-active-whe.patch rename to 0012-Reset-currentChanges-if-currentChanges-is-active-whe.patch diff --git a/0015-Don-t-convert-QByteArray-in-startDrag.patch b/0013-Don-t-convert-QByteArray-in-startDrag.patch similarity index 100% rename from 0015-Don-t-convert-QByteArray-in-startDrag.patch rename to 0013-Don-t-convert-QByteArray-in-startDrag.patch diff --git a/0016-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch b/0014-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch similarity index 100% rename from 0016-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch rename to 0014-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch diff --git a/0017-Implement-accessibility-for-QQuickWidget.patch b/0015-Implement-accessibility-for-QQuickWidget.patch similarity index 100% rename from 0017-Implement-accessibility-for-QQuickWidget.patch rename to 0015-Implement-accessibility-for-QQuickWidget.patch diff --git a/0018-Send-ObjectShow-event-for-visible-components-after-i.patch b/0016-Send-ObjectShow-event-for-visible-components-after-i.patch similarity index 100% rename from 0018-Send-ObjectShow-event-for-visible-components-after-i.patch rename to 0016-Send-ObjectShow-event-for-visible-components-after-i.patch diff --git a/0019-QQuickItem-avoid-emitting-signals-during-destruction.patch b/0017-QQuickItem-avoid-emitting-signals-during-destruction.patch similarity index 100% rename from 0019-QQuickItem-avoid-emitting-signals-during-destruction.patch rename to 0017-QQuickItem-avoid-emitting-signals-during-destruction.patch diff --git a/0020-a11y-track-item-enabled-state.patch b/0018-a11y-track-item-enabled-state.patch similarity index 100% rename from 0020-a11y-track-item-enabled-state.patch rename to 0018-a11y-track-item-enabled-state.patch diff --git a/0021-Make-QaccessibleQuickWidget-private-API.patch b/0019-Make-QaccessibleQuickWidget-private-API.patch similarity index 100% rename from 0021-Make-QaccessibleQuickWidget-private-API.patch rename to 0019-Make-QaccessibleQuickWidget-private-API.patch diff --git a/qt5-qtdeclarative-gcc11.patch b/0020-qt5-qtdeclarative-gcc11.patch similarity index 100% rename from qt5-qtdeclarative-gcc11.patch rename to 0020-qt5-qtdeclarative-gcc11.patch diff --git a/qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch b/0021-qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch similarity index 100% rename from qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch rename to 0021-qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index b4dd7b7..e57ce30 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -13,28 +13,28 @@ License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz -Patch1: 0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch -Patch2: 0002-Support-apos-in-styled-text.patch -Patch3: 0003-Remove-unused-QPointer-QQuickPointerMask.patch -Patch4: 0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch -Patch5: 0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch -Patch8: 0008-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch -Patch9: 0009-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch -Patch10: 0010-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch -Patch11: 0011-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch -Patch12: 0012-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch -Patch13: 0013-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch -Patch14: 0014-Reset-currentChanges-if-currentChanges-is-active-whe.patch -Patch15: 0015-Don-t-convert-QByteArray-in-startDrag.patch -Patch16: 0016-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch -Patch17: 0017-Implement-accessibility-for-QQuickWidget.patch -Patch18: 0018-Send-ObjectShow-event-for-visible-components-after-i.patch -Patch19: 0019-QQuickItem-avoid-emitting-signals-during-destruction.patch -Patch20: 0020-a11y-track-item-enabled-state.patch -Patch21: 0021-Make-QaccessibleQuickWidget-private-API.patch - -Patch100: %{name}-gcc11.patch -Patch101: %{qt_module}-5.15.0-FixMaxXMaxYExtent.patch +Patch0001: 0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch +Patch0002: 0002-Support-apos-in-styled-text.patch +Patch0003: 0003-Remove-unused-QPointer-QQuickPointerMask.patch +Patch0004: 0004-QQmlDelegateModel-Refresh-the-view-when-a-column-is-.patch +Patch0005: 0005-Fix-sweep-step-for-tainted-QObject-JavaScript-wrappe.patch +Patch0006: 0006-QQmlJs-FixedPoolArray-fix-UB-precondition-violation-.patch +Patch0007: 0007-V4-Do-not-call-dtor-of-an-object-we-continue-to-use.patch +Patch0008: 0008-Make-sure-QQuickWidget-and-its-offscreen-window-s-sc.patch +Patch0009: 0009-QQuickItem-Guard-against-cycles-in-nextPrevItemInTab.patch +Patch0010: 0010-QSGOpenGLDistanceFieldGlyphCache-fix-multiplication-.patch +Patch0011: 0011-QSGOpenGLDistanceFieldGlyphCache-fix-UB-ordering-of-.patch +Patch0012: 0012-Reset-currentChanges-if-currentChanges-is-active-whe.patch +Patch0013: 0013-Don-t-convert-QByteArray-in-startDrag.patch +Patch0014: 0014-Fix-build-after-95290f66b806a307b8da1f72f8fc2c698019.patch +Patch0015: 0015-Implement-accessibility-for-QQuickWidget.patch +Patch0016: 0016-Send-ObjectShow-event-for-visible-components-after-i.patch +Patch0017: 0017-QQuickItem-avoid-emitting-signals-during-destruction.patch +Patch0018: 0018-a11y-track-item-enabled-state.patch +Patch0019: 0019-Make-QaccessibleQuickWidget-private-API.patch + +Patch0020: 0020-%{name}-gcc11.patch +Patch0021: 0021-%{qt_module}-5.15.0-FixMaxXMaxYExtent.patch BuildRequires: make gcc-c++ qt5-rpm-macros qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-private-devel python%{python3_pkgversion} -- Gitee