From e439ce197c161113ef0c5397ae4ff6c7c19ab07e Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 10 Mar 2020 08:45:31 +0000
Subject: [PATCH] extra/qt5-webkit to 5.212.0alpha4-1

---
 extra/qt5-webkit/PKGBUILD    | 11 ++++-------
 extra/qt5-webkit/icu65.patch | 37 ------------------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 extra/qt5-webkit/icu65.patch

diff --git a/extra/qt5-webkit/PKGBUILD b/extra/qt5-webkit/PKGBUILD
index 248a0dee0..e053a6387 100644
--- a/extra/qt5-webkit/PKGBUILD
+++ b/extra/qt5-webkit/PKGBUILD
@@ -10,26 +10,23 @@
 highmem=1
 
 pkgname=qt5-webkit
-_pkgver=5.212.0-alpha3
+_pkgver=5.212.0-alpha4
 pkgver=${_pkgver/-/}
-pkgrel=9
+pkgrel=1
 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"
-        icu65.patch
         'atomic.patch')
 depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen woff2)
-makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools)
+makedepends=(cmake ruby gperf python qt5-doc qt5-tools)
 optdepends=('gst-plugins-good: Webm codec support')
-sha256sums=('357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17'
-            '2c806634ba208696a6cee4de72deefb289dd623378fddf92b09a36e3a99382fd'
+sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
             '23fbd785daf116c71b3ce87d40860f0a6c56ab1065ee98ec41634626ca961129')
 
 prepare() {
   mkdir -p build
-  patch -Np1 -d qtwebkit-$_pkgver <icu65.patch
 
   if [[ $CARCH == "arm" || $CARCH == "armv6h" ]]; then
     cd qtwebkit-$_pkgver
diff --git a/extra/qt5-webkit/icu65.patch b/extra/qt5-webkit/icu65.patch
deleted file mode 100644
index 2ef4ac02a..000000000
--- a/extra/qt5-webkit/icu65.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-Date: Tue, 8 Oct 2019 01:20:22 +0300
-Subject: [PATCH] Import QtWebKit commit
- 5e53102492e5ce85bda2657468f1369a0173c2ce
-
-Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628
-Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
-
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 1bca2d0a66f..19355f16601 100644
---- a/Source/WebCore/dom/Document.cpp
-+++ b/Source/WebCore/dom/Document.cpp
-@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
-     unsigned i = 0;
- 
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (!isValidNameStart(c))
-         return false;
- 
-     while (i < length) {
--        U16_NEXT(characters, i, length, c)
-+        U16_NEXT(characters, i, length, c);
-         if (!isValidNamePart(c))
-             return false;
-     }
-@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
- 
-     for (unsigned i = 0; i < length;) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon) {
-                 ec = NAMESPACE_ERR;