[arch-commits] Commit in qt5-webengine/trunk (PKGBUILD qtbug-93802.patch)

[Antonio Rojas]

    Date: Monday, June 7, 2021 @ 10:35:21
  Author: arojas
Revision: 417268

Replace patch with upstream commit

Modified:
  qt5-webengine/trunk/PKGBUILD
Deleted:
  qt5-webengine/trunk/qtbug-93802.patch

-------------------+
 PKGBUILD          |    8 +++-----
 qtbug-93802.patch |   27 ---------------------------
 2 files changed, 3 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-07 10:23:17 UTC (rev 417267)
+++ PKGBUILD	2021-06-07 10:35:21 UTC (rev 417268)
@@ -18,13 +18,11 @@
 source=(git+https://code.qt.io/qt/qtwebengine.git#tag=v${pkgver}-lts
         git+https://code.qt.io/qt/qtwebengine-chromium.git
         qt5-webengine-glibc-2.33.patch
-        qtbug-91773.patch
-        qtbug-93802.patch)
+        qtbug-91773.patch)
 sha256sums=('SKIP'
             'SKIP'
             '2294e5390c869963fc58f7bf1ee0a254a3f7fce3ed00c04e34a5f03e2b31b624'
-            '02009c7f87a216131ab96418c9ddb21e697e61668a970b972242f0015b36ba4c'
-            '38a99bb2839e93f17826af53b8a4dc5e845b5d09cbfdf92a4a5d55bb939f01dc')
+            '02009c7f87a216131ab96418c9ddb21e697e61668a970b972242f0015b36ba4c')
 
 prepare() {
   mkdir -p build
@@ -35,7 +33,7 @@
   git submodule set-branch --branch 87-based src/3rdparty
   git submodule update
 
-  patch -p1 < "$srcdir"/qtbug-93802.patch # Fix scrolling with touchpad
+  git cherry-pick -n eafc7b60313d9827f976f1d4fbb5e7f5d54eea7b # Fix scrolling with touchpad
   patch -p1 < "$srcdir"/qtbug-91773.patch # Fix load signals 4d4fc9cd120376f30ce0630b1e8c7bf174d44fae
   patch -p1 -i "$srcdir"/qt5-webengine-glibc-2.33.patch # Fix text rendering when building with glibc 2.33
 

Deleted: qtbug-93802.patch
===================================================================
--- qtbug-93802.patch	2021-06-07 10:23:17 UTC (rev 417267)
+++ qtbug-93802.patch	2021-06-07 10:35:21 UTC (rev 417268)
@@ -1,27 +0,0 @@
-From f9881e0556368da36b36687183e4be351bfbd81b Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen at qt.io>
-Date: Wed, 2 Jun 2021 15:54:43 +0200
-Subject: [PATCH] Always send phased wheel events beginning with Began
-
-The input event router does not like MayBegin.
-
-Fixes: QTBUG-93082
-Change-Id: I4ac9677d7f69da3d36fc33c17541026f011feb42
----
- src/core/web_event_factory.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
-index 593acb5e5c..aa5ea40365 100644
---- a/src/core/web_event_factory.cpp
-+++ b/src/core/web_event_factory.cpp
-@@ -1585,7 +1585,7 @@ blink::WebMouseWheelEvent::Phase toBlinkPhase(QWheelEvent *ev)
- #endif
-         return blink::WebMouseWheelEvent::kPhaseNone;
-     case Qt::ScrollBegin:
--        return ev->angleDelta().isNull() ? blink::WebMouseWheelEvent::kPhaseMayBegin : blink::WebMouseWheelEvent::kPhaseBegan;
-+        return blink::WebMouseWheelEvent::kPhaseBegan;
-     case Qt::ScrollUpdate:
-         return blink::WebMouseWheelEvent::kPhaseChanged;
-     case Qt::ScrollEnd:
---