From a16f618a0c649fb64006e3db938edd7f1006ffe2 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Tue, 12 May 2020 08:13:21 -0400
Subject: [PATCH] qt5-webkit: new snapshot; fix for upcoming icu-67.1

---
 srcpkgs/qt5-webkit/patches/armv6l-asm.patch | 23 ------------
 srcpkgs/qt5-webkit/patches/icu.patch        | 40 +++++++++++++++++++++
 srcpkgs/qt5-webkit/template                 |  4 +--
 3 files changed, 42 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/qt5-webkit/patches/armv6l-asm.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu.patch

diff --git a/srcpkgs/qt5-webkit/patches/armv6l-asm.patch b/srcpkgs/qt5-webkit/patches/armv6l-asm.patch
deleted file mode 100644
index 284929f035d..00000000000
--- a/srcpkgs/qt5-webkit/patches/armv6l-asm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix code emitted for armv6l to not use movw/movt but ldr.
-See https://bugs.webkit.org/show_bug.cgi?id=131612
-and https://bugs.webkit.org/show_bug.cgi?id=141288
-
---- Source/JavaScriptCore/offlineasm/arm.rb	2015-07-22 14:37:57.000000000 +0200
-+++ Source/JavaScriptCore/offlineasm/arm.rb	2015-08-08 00:31:21.011824644 +0200
-@@ -473,8 +473,16 @@
-                 $asm.puts "mov #{armFlippedOperands(operands)}"
-             end
-         when "mvlbl"
-+            if isARMv7 or isARMv7Traditional
-                 $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
-                 $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
-+            else
-+                $mvlbl_counter ||= 0
-+                $mvlbl_counter += 1
-+                const_label = "_mvlbl_const_label#{$mvlbl_counter}"
-+                $asm.puts ".equ #{const_label}, (#{operands[0].value})"
-+                $asm.puts "ldr  #{operands[1].armOperand}, =#{const_label}"
-+            end
-         when "nop"
-             $asm.puts "nop"
-         when "bieq", "bpeq", "bbeq"
diff --git a/srcpkgs/qt5-webkit/patches/icu.patch b/srcpkgs/qt5-webkit/patches/icu.patch
new file mode 100644
index 00000000000..1fc3b256101
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu.patch
@@ -0,0 +1,40 @@
+From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 4 Oct 2019 22:17:11 +0200
+Subject: [PATCH] Add missing semicolons to fix build with icu 65.1
+
+---
+ Source/WebCore/dom/Document.cpp |  6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git Source/WebCore/dom/Document.cpp Source/WebCore/dom/Document.cpp
+index 0fd0fa090bf..01f76850f3d 100644
+--- Source/WebCore/dom/Document.cpp
++++ Source/WebCore/dom/Document.cpp
+@@ -4954,12 +4954,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;
+     }
+@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
+ 
+     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 };
+-- 
+2.23.0
+
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 4a4d0282dad..e86fbb8e483 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,8 +1,8 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=7
-_snap=1565895469
+revision=8
+_snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-everywhere-src-${_v}"
 build_style=cmake