From 58cb314b0816a8b67decdca6a85ecb12d6271db4 Mon Sep 17 00:00:00 2001 From: Randy McCaskill Date: Tue, 12 May 2020 08:13:21 -0400 Subject: [PATCH] qt5-webkit: new snapshot; fix for icu 67.1 --- srcpkgs/qt5-webkit/patches/armv6l-asm.patch | 23 ----- srcpkgs/qt5-webkit/patches/icu.patch | 40 +++++++++ srcpkgs/qt5-webkit/patches/qt5.14.patch | 93 -------------------- srcpkgs/qt5-webkit/patches/qt5.14.patch.args | 1 - srcpkgs/qt5-webkit/template | 10 +-- srcpkgs/qt5-webkit/update | 2 +- 6 files changed, 46 insertions(+), 123 deletions(-) delete mode 100644 srcpkgs/qt5-webkit/patches/armv6l-asm.patch create mode 100644 srcpkgs/qt5-webkit/patches/icu.patch delete mode 100644 srcpkgs/qt5-webkit/patches/qt5.14.patch delete mode 100644 srcpkgs/qt5-webkit/patches/qt5.14.patch.args 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 +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> 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/patches/qt5.14.patch b/srcpkgs/qt5-webkit/patches/qt5.14.patch deleted file mode 100644 index 799d53f1f55..00000000000 --- a/srcpkgs/qt5-webkit/patches/qt5.14.patch +++ /dev/null @@ -1,93 +0,0 @@ -From c344187a099f8fd749dc84ffcc125c0925103819 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Tue, 10 Sep 2019 03:51:42 +0300 -Subject: Fix compilation of HTTP2 settings with Qt >= 5.14 - -Public API QHttp2Configuration was added, so we use it now instead of -ugly hack required for previous versions. Workaround for QTBUG-77308 is -no loger needed in 5.14, so we only enable server push. - -Change-Id: I3e6817d8fa274c3a849f09b23ca58f93318be6c4 ---- - .../network/qt/QNetworkReplyHandler.cpp | 6 +++--- - .../platform/network/qt/ResourceRequestQt.cpp | 20 ++++++++++++++++++- - 2 files changed, 22 insertions(+), 4 deletions(-) - -diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp -index 0da45fbc79a5..7924595582ac 100644 ---- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp -+++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp -@@ -41,7 +41,7 @@ - - #include - --#if USE(HTTP2) -+#if USE(HTTP2) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - - #include - #include -@@ -62,7 +62,7 @@ ProtocolParameters::ProtocolParameters() - - QT_END_NAMESPACE - --#endif // USE(HTTP2) -+#endif // USE(HTTP2) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - - static const int gMaxRedirections = 10; - -@@ -797,7 +797,7 @@ QNetworkReply* QNetworkReplyHandler::sendNetworkRequest(QNetworkAccessManager* m - if (!manager) - return 0; - --#if USE(HTTP2) -+#if USE(HTTP2) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - static const bool alpnIsSupported = ResourceRequest::alpnIsSupported(); - if (alpnIsSupported && !manager->property(Http2::http2ParametersPropertyName).isValid()) { - Http2::ProtocolParameters params; -diff --git a/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp b/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp -index 2cf2e7750dde..310738449b75 100644 ---- a/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp -+++ b/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp -@@ -29,7 +29,10 @@ - - #if USE(HTTP2) - #include -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+#include - #endif -+#endif // USE(HTTP2) - - namespace WebCore { - -@@ -65,6 +68,16 @@ bool ResourceRequest::alpnIsSupported() - return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && - QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); - } -+ -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+static QHttp2Configuration createHttp2Configuration() -+{ -+ QHttp2Configuration params; -+ params.setServerPushEnabled(true); -+ return params; -+} -+#endif -+ - #endif - - QNetworkRequest ResourceRequest::toNetworkRequest(NetworkingContext *context) const -@@ -76,8 +89,13 @@ QNetworkRequest ResourceRequest::toNetworkRequest(NetworkingContext *context) co - - #if USE(HTTP2) - static const bool NegotiateHttp2ForHttps = alpnIsSupported(); -- if (originalUrl.protocolIs("https") && NegotiateHttp2ForHttps) -+ if (originalUrl.protocolIs("https") && NegotiateHttp2ForHttps) { -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ static const auto params = createHttp2Configuration(); -+ request.setHttp2Configuration(params); -+#endif - request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true); -+ } - #endif // USE(HTTP2) - - const HTTPHeaderMap &headers = httpHeaderFields(); diff --git a/srcpkgs/qt5-webkit/patches/qt5.14.patch.args b/srcpkgs/qt5-webkit/patches/qt5.14.patch.args deleted file mode 100644 index 2eba1cb3c5c..00000000000 --- a/srcpkgs/qt5-webkit/patches/qt5.14.patch.args +++ /dev/null @@ -1 +0,0 @@ --Np1 diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 4a4d0282dad..882fc76c69b 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -1,10 +1,10 @@ # 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}" +wrksrc="qtwebkit-opensource-src-${_v}" build_style=cmake # some nasty stuff to prevent cmake from inducing buggy -O3 and default -g configure_args="-DPORT=Qt -DUSE_LD_GOLD=OFF @@ -23,8 +23,8 @@ short_desc="Cross-platform application and UI framework (Qt5) - WebKit2 componen maintainer="q66 " license="LGPL-2.1-or-later" homepage="https://www.qt.io/" -distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submodules/qtwebkit-everywhere-src-${_v}.tar.xz" -checksum=607f0a13e05bbf831d86904d12ae464e7d46a15f0ceed2465487b53512948824 +distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submodules/qtwebkit-opensource-src-${_v}.tar.xz" +checksum=9a6ed083154c7ec850081102b299afa928ca7e48bbdf2b5f3ae152425e46eb17 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include" CXXFLAGS="-fpermissive -Wno-class-memaccess" diff --git a/srcpkgs/qt5-webkit/update b/srcpkgs/qt5-webkit/update index f9f046d29f3..0d74c2cff12 100644 --- a/srcpkgs/qt5-webkit/update +++ b/srcpkgs/qt5-webkit/update @@ -1 +1 @@ -pkgname=qtwebkit-everywhere-src +pkgname=qtwebkit-opensource-src