From 40f96da7d79f3850ba6729f33a4f029aefe7f57c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 22 Nov 2020 17:42:09 +0000
Subject: [PATCH] extra/qt5-webkit to 5.212.0alpha4-8

---
 extra/qt5-webkit/PKGBUILD | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/extra/qt5-webkit/PKGBUILD b/extra/qt5-webkit/PKGBUILD
index 78b717e60..59cd1890f 100644
--- a/extra/qt5-webkit/PKGBUILD
+++ b/extra/qt5-webkit/PKGBUILD
@@ -12,21 +12,26 @@ highmem=1
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha4
 pkgver=${_pkgver/-/}
-pkgrel=7
+pkgrel=8
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
 source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz"
+         qt5-webkit-python-3.9.patch::"https://github.com/qtwebkit/qtwebkit/commit/78360c01.patch"
+         qt5-webkit-bison-3.7.patch::"https://github.com/qtwebkit/qtwebkit/commit/d92b11fe.patch"
         'atomic.patch')
 depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen woff2)
 makedepends=(cmake ruby gperf python qt5-doc qt5-tools)
 optdepends=('gst-plugins-good: Webm codec support')
 sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
+            '9db5480dfbd3c440489e8e4131e3555b2af61fa4b6c19f35227588c5996be128'
+            'cc5a2b762426e9cda5a3ae056bba266b5f775ee75c0590913839c255d5f10db0'
             '23fbd785daf116c71b3ce87d40860f0a6c56ab1065ee98ec41634626ca961129')
 
 prepare() {
-  mkdir -p build
+  patch -d qtwebkit-$_pkgver -p1 -i ../qt5-webkit-python-3.9.patch # Fix build with python 3.9
+  patch -d qtwebkit-$_pkgver -p1 -i ../qt5-webkit-bison-3.7.patch # Fix build with bison 3.7
 
   if [[ $CARCH == "arm" || $CARCH == "armv6h" ]]; then
     cd qtwebkit-$_pkgver
@@ -35,22 +40,19 @@ prepare() {
 }
 
 build() {
-  cd build
-
   [[ $CARCH == "arm" || $CARCH == "armv6h" ]] && CONFIG="-DENABLE_JIT=OFF"
 
-  cmake ../qtwebkit-$_pkgver \
+  cmake -B build -S qtwebkit-$_pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \
     -DPORT=Qt \
     -DENABLE_TOOLS=OFF \
     $CONFIG
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 
   install -d "$pkgdir"/usr/share/licenses
   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}