From 7a7dc8c9f3cd2c78ce2f17608fdb1599914add0b Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 23 Jan 2020 00:17:59 +0000
Subject: [PATCH] extra/webkit2gtk to 2.26.3-1

---
 extra/webkit2gtk/PKGBUILD    | 13 +++++-------
 extra/webkit2gtk/icu65.patch | 39 ------------------------------------
 2 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 extra/webkit2gtk/icu65.patch

diff --git a/extra/webkit2gtk/PKGBUILD b/extra/webkit2gtk/PKGBUILD
index 193f7f64b..c61918959 100644
--- a/extra/webkit2gtk/PKGBUILD
+++ b/extra/webkit2gtk/PKGBUILD
@@ -7,8 +7,8 @@
 highmem=1
 
 pkgname=webkit2gtk
-pkgver=2.26.2
-pkgrel=2
+pkgver=2.26.3
+pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=(x86_64)
 url="https://webkitgtk.org/"
@@ -21,17 +21,14 @@ optdepends=('geoclue: Geolocation support'
             'gst-plugins-good: media decoding'
             'gst-plugins-bad: media decoding'
             'gst-libav: nonfree media decoding')
-source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
-        icu65.patch)
-sha256sums=('6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512'
-            'SKIP'
-            '3acd85fecfca223e3fbf834e3be286ea29270689da994a758659abc8ed0a6635')
+source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc})
+sha256sums=('add51153943cc11d90a7038d0ea5f6332281e6c0be0640f802a211b035f0e611'
+            'SKIP')
 validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3'
               '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B')
 
 prepare() {
   cd webkitgtk-$pkgver
-  patch -Np1 -i ../icu65.patch # from PLD Linux
 }
 
 build() {
diff --git a/extra/webkit2gtk/icu65.patch b/extra/webkit2gtk/icu65.patch
deleted file mode 100644
index e1d7f8a2d..000000000
--- a/extra/webkit2gtk/icu65.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN webkitgtk-2.26.1.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.26.1/Source/WebCore/dom/Document.cpp
---- webkitgtk-2.26.1.orig/Source/WebCore/dom/Document.cpp	2019-09-02 11:41:47.000000000 +0200
-+++ webkitgtk-2.26.1/Source/WebCore/dom/Document.cpp	2019-10-08 16:24:57.649551493 +0200
-@@ -4944,12 +4944,12 @@
-     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;
-     }
-@@ -5009,7 +5009,7 @@
- 
-     for (unsigned i = 0; i < length; ) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon)
-                 return Exception { InvalidCharacterError };
-diff -urN webkitgtk-2.26.1.orig/Source/WTF/wtf/URLHelpers.cpp webkitgtk-2.26.1/Source/WTF/wtf/URLHelpers.cpp
---- webkitgtk-2.26.1.orig/Source/WTF/wtf/URLHelpers.cpp	2019-08-28 13:46:29.000000000 +0200
-+++ webkitgtk-2.26.1/Source/WTF/wtf/URLHelpers.cpp	2019-10-08 16:24:50.619850993 +0200
-@@ -301,7 +301,7 @@
-     Optional<UChar32> previousCodePoint;
-     while (i < length) {
-         UChar32 c;
--        U16_NEXT(buffer, i, length, c)
-+        U16_NEXT(buffer, i, length, c);
-         UErrorCode error = U_ZERO_ERROR;
-         UScriptCode script = uscript_getScript(c, &error);
-         if (error != U_ZERO_ERROR) {