Date: Tuesday, November 12, 2019 @ 00:40:04 Author: foutrelis Revision: 367819
Fix build with ICU 65 Added: qt5-webkit/trunk/icu65.patch Modified: qt5-webkit/trunk/PKGBUILD -------------+ PKGBUILD | 7 +++++-- icu65.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-12 00:26:36 UTC (rev 367818) +++ PKGBUILD 2019-11-12 00:40:04 UTC (rev 367819) @@ -10,14 +10,17 @@ 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") +source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz" + icu65.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) optdepends=('gst-plugins-good: Webm codec support') -sha256sums=('357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17') +sha256sums=('357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17' + '2c806634ba208696a6cee4de72deefb289dd623378fddf92b09a36e3a99382fd') prepare() { mkdir -p build + patch -Np1 -d qtwebkit-$_pkgver <icu65.patch } build() { Added: icu65.patch =================================================================== --- icu65.patch (rev 0) +++ icu65.patch 2019-11-12 00:40:04 UTC (rev 367819) @@ -0,0 +1,37 @@ +From 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev <annu...@yandex.ru> +Date: Tue, 8 Oct 2019 01:20:22 +0300 +Subject: [PATCH] Import QtWebKit commit + 5e53102492e5ce85bda2657468f1369a0173c2ce + +Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628 +Reviewed-by: Konstantin Tokarev <annu...@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;