git » qt5-webengine.git » commit ddfcb9a

Update to 5.15.5

author Antonio Rojas
2021-06-18 12:11:07 UTC
committer Antonio Rojas
2021-06-18 12:11:07 UTC
parent d6f02b6241e254127479258f325f4c70b13eba92

Update to 5.15.5

PKGBUILD +5 -14

diff --git a/PKGBUILD b/PKGBUILD
index 7a49a8c..cc34310 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qt5-webengine
-_qtver=5.15.4
+_qtver=5.15.5
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=1
 arch=('x86_64')
 url='https://www.qt.io'
 license=('LGPL3' 'LGPL2.1' 'BSD')
 pkgdesc='Provides support for web applications using the Chromium browser project'
-depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss' 
+depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss' 'libxkbfile' 
          'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx' 'libxtst' 'ttf-font')
 makedepends=('git' 'python2' 'python' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler' 'libpipewire02' 'nodejs')
 optdepends=('libpipewire02: WebRTC desktop sharing under Wayland')
@@ -17,12 +17,10 @@ groups=('qt' 'qt5')
 _pkgfqn=qtwebengine
 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)
+        qt5-webengine-glibc-2.33.patch)
 sha256sums=('SKIP'
             'SKIP'
-            '2294e5390c869963fc58f7bf1ee0a254a3f7fce3ed00c04e34a5f03e2b31b624'
-            '02009c7f87a216131ab96418c9ddb21e697e61668a970b972242f0015b36ba4c')
+            '2294e5390c869963fc58f7bf1ee0a254a3f7fce3ed00c04e34a5f03e2b31b624')
 
 prepare() {
   mkdir -p build
@@ -33,14 +31,7 @@ prepare() {
   git submodule set-branch --branch 87-based src/3rdparty
   git submodule update
 
-  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
-
-  cd src/3rdparty
-  git cherry-pick -n b498f4ce3f542882767238ea9f01eb85de6c6fda # Fix build with GCC 11
-  git cherry-pick -n 12ecfd11e326219ef185e7fdd6d967985fc57599 # Fix crashes due to old cached data  
-  git cherry-pick -n e67c7b49247c8b9646790c718b85d8ba75b68945 # Fix build with ICU 69
 }
 
 build() {