From 222d29fbea46cc3667da9f9e114d5a0c1824455c Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Mon, 2 Dec 2019 12:49:22 +1100
Subject: qtwebkit: fix for icu 65.x

---
 qtwebkit/.signature  |  5 +++--
 qtwebkit/Pkgfile     |  8 ++++++--
 qtwebkit/icu65.patch | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 qtwebkit/icu65.patch

(limited to 'qtwebkit')

diff --git a/qtwebkit/.signature b/qtwebkit/.signature
index bf79eda31..78b1ad047 100644
--- a/qtwebkit/.signature
+++ b/qtwebkit/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/UbkZA3AcNevHDxs5QgtzGpXNWhnAXEbT1AMjjKCIydwoLin8WKM+L8ClRR+oNqeo7IrvuSMJVjiqB2wtLchJA0=
-SHA256 (Pkgfile) = 679ed9baeffea2ae490701fc17473a29747af7a20d6907179434338a6b981889
+RWSE3ohX2g5d/TwD0C1mZ+6rXBAjIW0vOacTugYDUTSSOVGSdeWvujQWDDlJSTyMhC93BgPhk/uIcX9jk7RdVGlzVbwB9QyQzAc=
+SHA256 (Pkgfile) = 316d92acaa566b121903cf7a924175ad7f480c567902a9b644bf2aecbeaf60ca
 SHA256 (.footprint) = 839d04c7250b0262d6f81ad2c5ec4182e696bdb0a7c70c298afe2b0614269bc1
 SHA256 (qtwebkit-5.212.0-alpha3.tar.xz) = 357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17
+SHA256 (icu65.patch) = 2c806634ba208696a6cee4de72deefb289dd623378fddf92b09a36e3a99382fd
diff --git a/qtwebkit/Pkgfile b/qtwebkit/Pkgfile
index 4568fe68d..7b8889c11 100644
--- a/qtwebkit/Pkgfile
+++ b/qtwebkit/Pkgfile
@@ -6,17 +6,21 @@
 name=qtwebkit
 version=5.212.0.a3
 _version=${version/.a/-alpha}
-release=1
-source=(https://github.com/annulen/webkit/releases/download/$name-$_version/$name-$_version.tar.xz)
+release=2
+source=(https://github.com/annulen/webkit/releases/download/$name-$_version/$name-$_version.tar.xz
+	icu65.patch)
 
 build() {
 	cd $name-$_version
 
+	patch -p1 -i $SRC/icu65.patch
+
 	install -d build
 	cd build
 
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DPORT=Qt \
 		-DENABLE_TOOLS=OFF
diff --git a/qtwebkit/icu65.patch b/qtwebkit/icu65.patch
new file mode 100644
index 000000000..2ef4ac02a
--- /dev/null
+++ b/qtwebkit/icu65.patch
@@ -0,0 +1,37 @@
+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;
-- 
cgit v1.2.3