git » qt5-webengine.git » commit e2d18e1

Fix crash when scrolling with touchscreen (FS#59117)

author Antonio Rojas
2018-06-24 20:31:11 UTC
committer Antonio Rojas
2018-06-24 20:31:11 UTC
parent 31725bfd09979d23ae68d8d2919f587e4a6843aa

Fix crash when scrolling with touchscreen (FS#59117)

PKGBUILD +7 -3

diff --git a/PKGBUILD b/PKGBUILD
index d3c9950..149ea29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=qt5-webengine
 _qtver=5.11.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('LGPL3' 'LGPL2.1' 'BSD')
@@ -16,11 +16,13 @@ groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
 source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
          qtwebengine-harmony.patch qtwebengine-ffmpeg4.patch
-         qtwebengine-wayland.patch::"http://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=a66d4cd8")
+         qtwebengine-wayland.patch::"http://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=a66d4cd8"
+         qtbug-68699.patch::"http://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=6e019f2a")
 sha256sums=('389d9f42ca393ac11ec8932ce9771766dec91a4c761ffb685cc429c2a760d48c'
             'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
             '4a831d89fb0d6a6ced23115ced71e60513ce279fba4bd493178842647948f510'
-            '6baeb241165a1fd94ada95b27924ba55f74761b1b9d406d73ebcce4b139abf60')
+            '6baeb241165a1fd94ada95b27924ba55f74761b1b9d406d73ebcce4b139abf60'
+            '1f3eff42911e2ad6e6db8b2c5d4b230031c577e3396f37b1e73c33bcef16f6bb')
 
 prepare() {
   mkdir -p build
@@ -35,6 +37,8 @@ prepare() {
   patch -Np1 -i ../qtwebengine-harmony.patch
   # Fix openGL detection on Wayland
   patch -p1 -i ../qtwebengine-wayland.patch
+  # Fix crash when scrolling on touchscreen https://bugreports.qt.io/browse/QTBUG-68699
+  patch -p1 -i ../qtbug-68699.patch
 
   cd src/3rdparty/chromium
   # Fix build with ffmpeg 4