author | Antonio Rojas
<arojas@archlinux.org> 2021-06-02 14:51:13 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2021-06-02 14:51:13 UTC |
parent | 6123df136cedfb0af3712200826559c340e3516e |
PKGBUILD | +7 | -4 |
qtbug-93802.patch | +27 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index 3680f45..0b30679 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=qt5-webengine _qtver=5.15.4 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=3 arch=('x86_64') url='https://www.qt.io' license=('LGPL3' 'LGPL2.1' 'BSD') @@ -15,14 +15,16 @@ makedepends=('git' 'python2' 'python' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'pop optdepends=('libpipewire02: WebRTC desktop sharing under Wayland') groups=('qt' 'qt5') _pkgfqn=qtwebengine -source=(git+https://code.qt.io/qt/qtwebengine.git#tag=v$pkgver-lts +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-91773.patch + qtbug-93802.patch) sha256sums=('SKIP' 'SKIP' '2294e5390c869963fc58f7bf1ee0a254a3f7fce3ed00c04e34a5f03e2b31b624' - '02009c7f87a216131ab96418c9ddb21e697e61668a970b972242f0015b36ba4c') + '02009c7f87a216131ab96418c9ddb21e697e61668a970b972242f0015b36ba4c' + '38a99bb2839e93f17826af53b8a4dc5e845b5d09cbfdf92a4a5d55bb939f01dc') prepare() { mkdir -p build @@ -33,6 +35,7 @@ prepare() { git submodule set-branch --branch 87-based src/3rdparty git submodule update + patch -p1 < "$srcdir"/qtbug-93802.patch # 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 diff --git a/qtbug-93802.patch b/qtbug-93802.patch new file mode 100644 index 0000000..8e9db96 --- /dev/null +++ b/qtbug-93802.patch @@ -0,0 +1,27 @@ +From f9881e0556368da36b36687183e4be351bfbd81b Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@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: +--