From 3548b2522c8c0e83cbf56843058c87dd5b734c19 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 --- srcpkgs/qt5-webkit/patches/armv6l-asm.patch | 23 ----- srcpkgs/qt5-webkit/patches/mips-isa-32.patch | 14 --- .../qt5-webkit/patches/musl-mcontext.patch | 65 ------------- srcpkgs/qt5-webkit/patches/musl-ppc.patch | 14 --- srcpkgs/qt5-webkit/patches/ppc-llint.patch | 32 ------- .../qt5-webkit/patches/qt-musl-execinfo.patch | 13 --- 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 +- 10 files changed, 6 insertions(+), 261 deletions(-) delete mode 100644 srcpkgs/qt5-webkit/patches/armv6l-asm.patch delete mode 100644 srcpkgs/qt5-webkit/patches/mips-isa-32.patch delete mode 100644 srcpkgs/qt5-webkit/patches/musl-mcontext.patch delete mode 100644 srcpkgs/qt5-webkit/patches/musl-ppc.patch delete mode 100644 srcpkgs/qt5-webkit/patches/ppc-llint.patch delete mode 100644 srcpkgs/qt5-webkit/patches/qt-musl-execinfo.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/mips-isa-32.patch b/srcpkgs/qt5-webkit/patches/mips-isa-32.patch deleted file mode 100644 index cfa3b72296c..00000000000 --- a/srcpkgs/qt5-webkit/patches/mips-isa-32.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2019-08-15 20:56:14.000000000 +0200 -+++ Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2020-03-04 10:43:29.468482593 +0100 -@@ -315,11 +315,7 @@ - - void countLeadingZeros32(RegisterID src, RegisterID dest) - { --#if WTF_MIPS_ISA_AT_LEAST(32) - m_assembler.clz(dest, src); --#else -- static_assert(false, "CLZ opcode is not available for this ISA"); --#endif - } - - void lshift32(RegisterID shiftAmount, RegisterID dest) diff --git a/srcpkgs/qt5-webkit/patches/musl-mcontext.patch b/srcpkgs/qt5-webkit/patches/musl-mcontext.patch deleted file mode 100644 index c15587f1991..00000000000 --- a/srcpkgs/qt5-webkit/patches/musl-mcontext.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- Source/JavaScriptCore/heap/MachineStackMarker.cppg 2019-01-12 19:48:12.801137040 +0100 -+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp 2019-01-12 20:09:03.662201571 +0100 -@@ -681,7 +681,19 @@ - #endif - - #else --#error Need a way to get the frame pointer for another thread on this platform -+ -+// The following sequence depends on musl libc's sys/ucontext.h. -+#if CPU(X86) -+ return reinterpret_cast((uintptr_t) regs.machineContext.gregs[REG_EBP]); -+#elif CPU(X86_64) -+ return reinterpret_cast((uintptr_t) regs.machineContext.gregs[REG_RBP]); -+#elif CPU(ARM) -+ return reinterpret_cast((uintptr_t) regs.machineContext.arm_fp); -+#elif CPU(ARM64) -+ return reinterpret_cast((uintptr_t) regs.machineContext.regs[29]); -+#elif CPU(MIPS) -+ return reinterpret_cast((uintptr_t) regs.machineContext.gregs[30]); -+#endif - #endif - } - -@@ -761,7 +773,19 @@ - #endif - - #else --#error Need a way to get the instruction pointer for another thread on this platform -+ -+// The following sequence depends on musl libc's sys/ucontext.h. -+#if CPU(X86) -+ return reinterpret_cast((uintptr_t) regs.machineContext.gregs[REG_EIP]); -+#elif CPU(X86_64) -+ return reinterpret_cast((uintptr_t) regs.machineContext.gregs[REG_RIP]); -+#elif CPU(ARM) -+ return reinterpret_cast((uintptr_t) regs.machineContext.arm_pc); -+#elif CPU(ARM64) -+ return reinterpret_cast((uintptr_t) regs.machineContext.pc); -+#elif CPU(MIPS) -+ return reinterpret_cast((uintptr_t) regs.machineContext.pc); -+#endif - #endif - } - void* MachineThreads::Thread::Registers::llintPC() const -@@ -850,7 +874,19 @@ - #endif - - #else --#error Need a way to get the LLIntPC for another thread on this platform -+ -+// The following sequence depends on musl libc's sys/ucontext.h. -+#if CPU(X86) -+ return reinterpret_cast((uintptr_t) regs.machineContext.gregs[REG_ESI]); -+#elif CPU(X86_64) -+ return reinterpret_cast((uintptr_t) regs.machineContext.gregs[REG_R8]); -+#elif CPU(ARM) -+ return reinterpret_cast((uintptr_t) regs.machineContext.arm_r8); -+#elif CPU(ARM64) -+ return reinterpret_cast((uintptr_t) regs.machineContext.regs[4]); -+#elif CPU(MIPS) -+ return reinterpret_cast((uintptr_t) regs.machineContext.gregs[12]); -+#endif - #endif - } - #endif // ENABLE(SAMPLING_PROFILER) diff --git a/srcpkgs/qt5-webkit/patches/musl-ppc.patch b/srcpkgs/qt5-webkit/patches/musl-ppc.patch deleted file mode 100644 index 21d3017397e..00000000000 --- a/srcpkgs/qt5-webkit/patches/musl-ppc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Source/JavaScriptCore/heap/MachineStackMarker.cpp -+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp -@@ -87,7 +87,11 @@ static void pthreadSignalHandlerSuspendResume(int, siginfo_t*, void* ucontext) - - ucontext_t* userContext = static_cast(ucontext); - #if CPU(PPC) -+# if defined(__GLIBC__) - thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; -+# else -+ thread->suspendedMachineContext = *userContext->uc_regs; -+# endif - #else - thread->suspendedMachineContext = userContext->uc_mcontext; - #endif diff --git a/srcpkgs/qt5-webkit/patches/ppc-llint.patch b/srcpkgs/qt5-webkit/patches/ppc-llint.patch deleted file mode 100644 index 2fc5a46e523..00000000000 --- a/srcpkgs/qt5-webkit/patches/ppc-llint.patch +++ /dev/null @@ -1,32 +0,0 @@ -This fixes JavaScriptCore on big endian systems (mainly ppc). - -Without the patch, attempting to run any JS results in -a crash as the generated code was endian specific. - ---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm -+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm -@@ -1500,13 +1500,13 @@ _llint_op_put_by_id: - loadp StructureChain::m_vector[t3], t3 - assert(macro (ok) btpnz t3, ok end) - -- loadp Structure::m_prototype[t2], t2 -+ loadp Structure::m_prototype + PayloadOffset[t2], t2 - btpz t2, .opPutByIdTransitionChainDone - .opPutByIdTransitionChainLoop: - loadp [t3], t1 - bpneq t1, JSCell::m_structureID[t2], .opPutByIdSlow - addp 4, t3 -- loadp Structure::m_prototype[t1], t2 -+ loadp Structure::m_prototype + PayloadOffset[t1], t2 - btpnz t2, .opPutByIdTransitionChainLoop - - .opPutByIdTransitionChainDone: -@@ -1984,7 +1984,7 @@ _llint_throw_from_slow_path_trampoline: - # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so - # the throw target is not necessarily interpreted code, we come to here. - # This essentially emulates the JIT's throwing protocol. -- loadp Callee[cfr], t1 -+ loadp Callee + PayloadOffset[cfr], t1 - andp MarkedBlockMask, t1 - loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1 - copyCalleeSavesToVMCalleeSavesBuffer(t1, t2) diff --git a/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch b/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch deleted file mode 100644 index d3adbba9c32..00000000000 --- a/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2018-01-20 16:53:35.000000000 +0100 -+++ Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2019-01-12 18:56:04.698975664 +0100 -@@ -51,8 +51,10 @@ - #include - #if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK)) - #include -+#if defined(__GLIBC__) - #include - #endif -+#endif - - #if ENABLE(REMOTE_INSPECTOR) - #include "JSGlobalObjectDebuggable.h" 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