mirrors/aports
3
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-05-09 14:14:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

community/webkit2gtk: delete

Browse source
This commit is contained in:
Natanael Copa 2024-11-14 18:36:30 +01:00
parent 4ddee8dd23
commit 1bb817533b
7 changed files with 0 additions and 744 deletions

403
community/webkit2gtk/APKBUILD
View file

@ -1,403 +0,0 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Contributor: Jiri Horner <laeqten@gmail.com>
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname=webkit2gtk
pkgver=2.44.4
pkgrel=0
pkgdesc="Portable web rendering engine WebKit for GTK+"
url="https://webkitgtk.org/"
arch="all"
license="LGPL-2.0-or-later AND BSD-2-Clause"
depends="bubblewrap xdg-dbus-proxy dbus:org.freedesktop.Secrets"
makedepends="
bison
clang
cmake
enchant2-dev
flex
flite-dev
geoclue-dev
gnutls-dev
gobject-introspection-dev
gperf
gst-plugins-bad-dev
gst-plugins-base-dev
gstreamer-dev
gtk+3.0-dev
hyphen-dev
icu-dev
lcms2-dev
libavif-dev
libgcrypt-dev
libjpeg-turbo-dev
libmanette-dev
libpng-dev
libseccomp-dev
libsecret-dev
libsoup-dev
libwebp-dev
libwpe-dev
libwpebackend-fdo-dev
libxml2-dev
libxslt-dev
libxt-dev
llvm
mesa-dev
openjpeg-dev
pango-dev
python3
ruby
samurai
sqlite-dev
unifdef
woff2-dev
"
replaces="webkit"
options="!check" # upstream doesn't package them in release tarballs: Tools/Scripts/run-gtk-tests: Command not found
subpackages="$pkgname-dev $pkgname-lang $pkgname-dbg"
source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz
armv6kz.patch
armv6-musttail.patch
clang19.patch
cloopfix.patch
invalid-scope-annotation.patch
riscv64-no-wasm.patch
"
builddir="$srcdir/webkitgtk-$pkgver"
# secfixes:
# 2.36.5-r0:
# - CVE-2022-2294
# - CVE-2022-32792
# - CVE-2022-32816
# 2.36.4-r0:
# - CVE-2022-22677
# - CVE-2022-22710
# 2.36.1-r0:
# - CVE-2022-30293
# - CVE-2022-30294
# 2.36.0-r0:
# - CVE-2022-22624
# - CVE-2022-22628
# - CVE-2022-22629
# 2.34.6-r0:
# - CVE-2022-22589
# - CVE-2022-22590
# - CVE-2022-22592
# - CVE-2022-22620
# 2.34.4-r0:
# - CVE-2021-30934
# - CVE-2021-30936
# - CVE-2021-30951
# - CVE-2021-30952
# - CVE-2021-30953
# - CVE-2021-30954
# - CVE-2021-30984
# - CVE-2022-22637
# - CVE-2022-22594
# 2.34.3-r0:
# - CVE-2021-30887
# - CVE-2021-30890
# 2.34.1-r0:
# - CVE-2021-42762
# 2.34.0-r0:
# - CVE-2021-30818
# - CVE-2021-30823
# - CVE-2021-30846
# - CVE-2021-30851
# - CVE-2021-30884
# - CVE-2021-30888
# - CVE-2021-30889
# - CVE-2021-30897
# - CVE-2021-45481
# - CVE-2021-45483
# 2.32.4-r0:
# - CVE-2021-30809
# - CVE-2021-30836
# - CVE-2021-30848
# - CVE-2021-30849
# - CVE-2021-30858
# - CVE-2021-45482
# 2.32.3-r0:
# - CVE-2021-21775
# - CVE-2021-21779
# - CVE-2021-30663
# - CVE-2021-30665
# - CVE-2021-30689
# - CVE-2021-30720
# - CVE-2021-30734
# - CVE-2021-30744
# - CVE-2021-30749
# - CVE-2021-30795
# - CVE-2021-30797
# - CVE-2021-30799
# 2.32.2-r0:
# - CVE-2021-30758
# 2.32.0-r0:
# - CVE-2021-1788
# - CVE-2021-1844
# - CVE-2021-1871
# - CVE-2021-30682
# 2.30.6-r0:
# - CVE-2020-27918
# - CVE-2020-29623
# - CVE-2021-1765
# - CVE-2021-1789
# - CVE-2021-1799
# - CVE-2021-1801
# - CVE-2021-1870
# - CVE-2021-21806
# 2.30.5-r0:
# - CVE-2020-9947
# - CVE-2020-13558
# 2.30.3-r0:
# - CVE-2020-9983
# - CVE-2020-13543
# - CVE-2020-13584
# 2.30.0-r0:
# - CVE-2020-9948
# - CVE-2020-9951
# - CVE-2021-1817
# - CVE-2021-1820
# - CVE-2021-1825
# - CVE-2021-1826
# - CVE-2021-30661
# 2.28.4-r0:
# - CVE-2020-9862
# - CVE-2020-9893
# - CVE-2020-9894
# - CVE-2020-9895
# - CVE-2020-9915
# - CVE-2020-9925
# 2.28.3-r0:
# - CVE-2020-13753
# - CVE-2020-9802
# - CVE-2020-9803
# - CVE-2020-9805
# - CVE-2020-9806
# - CVE-2020-9807
# - CVE-2020-9843
# - CVE-2020-9850
# - CVE-2020-9952
# 2.28.1-r0:
# - CVE-2020-11793
# 2.28.0-r0:
# - CVE-2020-10018
# - CVE-2021-30762
# 2.26.3-r0:
# - CVE-2019-8835
# - CVE-2019-8844
# - CVE-2019-8846
# 2.26.2-r0:
# - CVE-2019-8812
# - CVE-2019-8814
# 2.26.1-r0:
# - CVE-2019-8783
# - CVE-2019-8811
# - CVE-2019-8813
# - CVE-2019-8816
# - CVE-2019-8819
# - CVE-2019-8820
# - CVE-2019-8823
# 2.26.0-r0:
# - CVE-2019-8625
# - CVE-2019-8710
# - CVE-2019-8720
# - CVE-2019-8743
# - CVE-2019-8764
# - CVE-2019-8766
# - CVE-2019-8769
# - CVE-2019-8771
# - CVE-2019-8782
# - CVE-2019-8815
# - CVE-2021-30666
# - CVE-2021-30761
# 2.24.4-r0:
# - CVE-2019-8674
# - CVE-2019-8707
# - CVE-2019-8719
# - CVE-2019-8733
# - CVE-2019-8763
# - CVE-2019-8765
# - CVE-2019-8768
# - CVE-2019-8821
# - CVE-2019-8822
# 2.24.3-r0:
# - CVE-2019-8644
# - CVE-2019-8649
# - CVE-2019-8658
# - CVE-2019-8666
# - CVE-2019-8669
# - CVE-2019-8671
# - CVE-2019-8672
# - CVE-2019-8673
# - CVE-2019-8676
# - CVE-2019-8677
# - CVE-2019-8678
# - CVE-2019-8679
# - CVE-2019-8680
# - CVE-2019-8681
# - CVE-2019-8683
# - CVE-2019-8684
# - CVE-2019-8686
# - CVE-2019-8687
# - CVE-2019-8688
# - CVE-2019-8689
# - CVE-2019-8690
# - CVE-2019-8726
# 2.24.2-r0:
# - CVE-2019-8735
# 2.24.1-r0:
# - CVE-2019-6251
# - CVE-2019-8506
# - CVE-2019-8524
# - CVE-2019-8535
# - CVE-2019-8536
# - CVE-2019-8544
# - CVE-2019-8551
# - CVE-2019-8558
# - CVE-2019-8559
# - CVE-2019-8563
# - CVE-2019-11070
# 2.22.7-r0:
# - CVE-2018-4437
# - CVE-2019-6212
# - CVE-2019-6215
# - CVE-2019-6216
# - CVE-2019-6217
# - CVE-2019-6227
# - CVE-2019-6229
# 2.22.4-r0:
# - CVE-2018-4372
# 2.18.4-r0:
# - CVE-2017-7156
# - CVE-2017-7157
# - CVE-2017-13856
# - CVE-2017-13866
# - CVE-2017-13870
# 2.14.5-r0:
# - CVE-2017-2350
# - CVE-2017-2354
# - CVE-2017-2355
# - CVE-2017-2356
# - CVE-2017-2362
# - CVE-2017-2363
# - CVE-2017-2364
# - CVE-2017-2365
# - CVE-2017-2366
# - CVE-2017-2369
# - CVE-2017-2371
# - CVE-2017-2373
case "$CARCH" in
s390x) ;;
*)
makedepends="$makedepends lld libjxl-dev"
;;
esac
build() {
case "$CARCH" in
s390x|armhf|armv7|x86|ppc64le|loongarch64)
# llint/LowLevelInterpreter.cpp fails to build with fortify source here
export CXXFLAGS="$CXXFLAGS -U_FORTIFY_SOURCE"
;;
esac
case "$CARCH" in
armv7)
# clang fails to build armv7 due to some NEON related thing.
# https://github.com/WebKit/WebKit/pull/1233 should fix it
;;
s390x|riscv64)
# no lld on s390x, broken on riscv64
export CC=clang
export CXX=clang++
;;
*)
# the debug symbols become 1/2 the size, and actual webkit becomes
# smaller too.
export CC=clang
export CXX=clang++
export LDFLAGS="$LDFLAGS -fuse-ld=lld"
;;
esac
case "$CARCH" in
arm*|aarch64|s390x|riscv64)
# arm: seemingly broken?
# s390x/riscv64: no lld
;;
*)
local lto="-DLTO_MODE=thin"
;;
esac
case "$CARCH" in
s390x)
# no libjxl
local jxl="-DUSE_JPEGXL=OFF"
;;
*) ;;
esac
case "$CARCH" in
riscv64)
# not supported
local jit="
-DENABLE_JIT=OFF
-DENABLE_C_LOOP=ON
-DENABLE_WEBASSEMBLY=OFF
"
;;
*) ;;
esac
export AR=llvm-ar
export NM=llvm-nm
export RANLIB=llvm-ranlib
# significantly reduce debug symbol size
export CFLAGS="$CFLAGS -g1"
export CXXFLAGS="$CXXFLAGS -g1"
# sampling profiler is broken on musl
cmake -B build -G Ninja \
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DENABLE_DOCUMENTATION=OFF \
-DENABLE_JOURNALD_LOG=OFF \
-DENABLE_MINIBROWSER=ON \
-DENABLE_SAMPLING_PROFILER=OFF \
-DENABLE_SPELLCHECK=ON \
-DENABLE_SPEECH_SYNTHESIS=ON \
-DUSE_SOUP2=ON \
-DUSE_GTK4=OFF \
-DUSE_LIBBACKTRACE=OFF \
$lto \
$jxl \
$jit
cmake --build build
}
check() {
ninja -C build check
}
package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
037ef6a9faca68b68dc62927a475134450493129043ea6cc03595cd4a684d590f80a1e9c3ed40a9176874ba43fc9efbc5065a264dfe131ebd72e272756612db9 webkitgtk-2.44.4.tar.xz
8c89d4ac737a2bd6d970fec3ecb9d0b72d61ffb9a37d4b0b56bc0106914398a65319e940c593c0305fc40d6900aac2a8b4fc3bafc9a96062063d15abd1f5039d armv6kz.patch
d3e3a20cf6f1447e15eec8636301fb5c4c12560e4a5d47707708425b0da8ab84e3b1a10f98c9ba4ed2e1a32a9c131055da14f8f74e8bde20d4269bf8313dc04d armv6-musttail.patch
a77beb15ae049ab198724680baec932a5e86aecaa817a03e34f6cad79306abd3bdd8a3582b8dc572dfbbab27ab833d67361fb934746bc92358fd7cc300e20258 clang19.patch
49acf07095abb3c6114790b676f1fe4c1f6c4c4d66d2aed525e61291bd9857386749cc31a521e3f739758ed6d6b0e176a45543e7c58ca16c9c1b266222d362ed cloopfix.patch
e5c4f8412cc4f56ef10eb9a19e72c7142b3ab14af9cb44deed276256c49a623935e4c24b6bec6c62945069a14f6a1a21e743955aea112448ac87ef55813b1946 invalid-scope-annotation.patch
61461d19f80108357d0469a855212308a49fb43f5a629d119f95492c3897444664cbe12beddc53d801878124a67e38b4a404d37d1ac9c0e5ce65d7586328b1d9 riscv64-no-wasm.patch
"

17
community/webkit2gtk/armv6-musttail.patch
View file

@ -1,17 +0,0 @@
skip musttail on armv6:
fatal error: error in backend: failed to perform tail call elimination on a call site marked musttail
diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
index 0ea5cb7..3bf5478 100644
--- a/Source/WTF/wtf/Compiler.h
+++ b/Source/WTF/wtf/Compiler.h
@@ -284,7 +284,7 @@
/* MUST_TAIL_CALL */
#if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute)
-#if __has_cpp_attribute(clang::musttail)
+#if __has_cpp_attribute(clang::musttail) && !(defined(__ARM_ARCH) && __ARM_ARCH == 6)
#define MUST_TAIL_CALL [[clang::musttail]]
#endif
#endif

15
community/webkit2gtk/armv6kz.patch
View file

@ -1,15 +0,0 @@
also defined _6KZ, as clang -march=armv6kz/zk defines this, not _6KZ, as it's a deprecated name
https://reviews.llvm.org/D14568
--
diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
index e5c41a0..4f51ad4 100644
--- a/Source/WTF/wtf/PlatformCPU.h
+++ b/Source/WTF/wtf/PlatformCPU.h
@@ -162,6 +162,7 @@
|| defined(__ARM_ARCH_6J__) \
|| defined(__ARM_ARCH_6K__) \
|| defined(__ARM_ARCH_6Z__) \
+ || defined(__ARM_ARCH_6KZ__) \
|| defined(__ARM_ARCH_6ZK__) \
|| defined(__ARM_ARCH_6T2__) \
|| defined(__ARMV6__)

239
community/webkit2gtk/clang19.patch
View file

@ -1,239 +0,0 @@
Patch-Source: https://git.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch
--
From 257ed304fb3e71d412568dcbed7129c145812fdf Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 2 Sep 2024 21:38:12 -0700
Subject: [PATCH] Fix build issues with latest Clang
https://bugs.webkit.org/show_bug.cgi?id=276198 rdar://130933637
Reviewed by Yusuke Suzuki.
The use of the template keyword to reference template members without a template argument list was deprecated in the C++ standard.
e.g. `foo.template bar()` nows needs to be `foo.template bar<>()`. I ran into a different issue with `std::reference_wrapper` that
blocked me from going any further, which AFAICT is a bug on the Clang side.
This also fixes a few other warnings that popped up while building with the new Clang denoted inline
* Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost.
* Source/JavaScriptCore/jit/AssemblyHelpers.cpp:
(JSC::AssemblyHelpers::emitNonNullDecodeZeroExtendedStructureID): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost.
* Source/JavaScriptCore/llint/InPlaceInterpreter.cpp:
* Source/JavaScriptCore/llint/LLIntData.h:
(JSC::LLInt::getCodeFunctionPtr):
(JSC::LLInt::getWide16CodeFunctionPtr):
(JSC::LLInt::getWide32CodeFunctionPtr):
* Source/JavaScriptCore/parser/Nodes.h: Missing definition of ModuleScopeData added include.
* Source/JavaScriptCore/runtime/JSCast.h:
(JSC::JSCastingHelpers::inherits):
(JSC::jsDynamicCast):
* Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/crypto/bio/connect.c:
(conn_callback_ctrl): Had a warning about an incompatible function type. Seems like this is intentional suppressed the warning.
* Source/WTF/wtf/cf/TypeCastsCF.h: Had a warning about extra namespace qualification. I just moved it out of the namespace. That said, it feels like this warning shouldn't apply to macro expansions...
* Source/WebCore/PAL/ThirdParty/libavif/ThirdParty/dav1d/src/decode.c:
(decode_b): Had a warning about different types on the middle/right of a ternary expression. I just pushed the comparison inside the ternary.
Canonical link: https://commits.webkit.org/280700@main
Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/62b6e2db547e#diff-136d848d7c1b400da9b486916b67592b54e5abf7c66ac247697a93ae2fb743a9]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp | 6 ++++--
Source/JavaScriptCore/jit/AssemblyHelpers.cpp | 6 ++++--
.../JavaScriptCore/llint/InPlaceInterpreter.cpp | 16 ++++++++--------
Source/JavaScriptCore/llint/LLIntData.h | 12 ++++++------
Source/JavaScriptCore/llint/LLIntThunks.cpp | 2 +-
Source/JavaScriptCore/parser/Nodes.h | 4 ++--
Source/JavaScriptCore/runtime/JSCast.h | 4 ++--
7 files changed, 27 insertions(+), 23 deletions(-)
--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
@@ -22930,8 +22930,10 @@ IGNORE_CLANG_WARNINGS_END
return m_out.shl(m_out.zeroExtPtr(structureID), m_out.constIntPtr(StructureID::encodeShiftAmount));
#else
LValue maskedStructureID = structureID;
- if constexpr (structureHeapAddressSize < 4 * GB)
- maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(StructureID::structureIDMask));
+ if constexpr (structureHeapAddressSize < 4 * GB) {
+ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask);
+ maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(static_cast<uint32_t>(StructureID::structureIDMask)));
+ }
return m_out.bitOr(m_out.constIntPtr(startOfStructureHeap()), m_out.zeroExtPtr(maskedStructureID));
#endif
}
--- a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
+++ b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
@@ -677,8 +677,10 @@ void AssemblyHelpers::emitNonNullDecodeZ
if constexpr (structureHeapAddressSize >= 4 * GB) {
ASSERT(structureHeapAddressSize == 4 * GB);
move(source, dest);
- } else
- and32(TrustedImm32(StructureID::structureIDMask), source, dest);
+ } else {
+ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask);
+ and32(TrustedImm32(static_cast<uint32_t>(StructureID::structureIDMask)), source, dest);
+ }
or64(TrustedImm64(startOfStructureHeap()), dest);
#else // not CPU(ADDRESS64)
move(source, dest);
--- a/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp
+++ b/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp
@@ -43,8 +43,8 @@ namespace JSC { namespace IPInt {
do { \
void* base = reinterpret_cast<void*>(ipint_unreachable_validate); \
void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
} while (false);
@@ -52,8 +52,8 @@ do { \
do { \
void* base = reinterpret_cast<void*>(ipint_i32_trunc_sat_f32_s_validate); \
void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
} while (false);
@@ -61,8 +61,8 @@ do { \
do { \
void* base = reinterpret_cast<void*>(ipint_simd_v128_load_mem_validate); \
void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
} while (false);
@@ -70,8 +70,8 @@ do { \
do { \
void* base = reinterpret_cast<void*>(ipint_memory_atomic_notify_validate); \
void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
} while (false);
--- a/Source/JavaScriptCore/llint/LLIntData.h
+++ b/Source/JavaScriptCore/llint/LLIntData.h
@@ -217,7 +217,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionP
#if COMPILER(MSVC)
return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr());
#else
- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr());
+ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>());
#endif
}
@@ -227,7 +227,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFun
#if COMPILER(MSVC)
return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr());
#else
- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr());
+ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>());
#endif
}
@@ -237,7 +237,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFun
#if COMPILER(MSVC)
return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr());
#else
- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr());
+ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>());
#endif
}
#else // not ENABLE(JIT)
@@ -361,7 +361,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionP
#if COMPILER(MSVC)
return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr());
#else
- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr());
+ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>());
#endif
}
@@ -371,7 +371,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFun
#if COMPILER(MSVC)
return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr());
#else
- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr());
+ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>());
#endif
}
@@ -381,7 +381,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFun
#if COMPILER(MSVC)
return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr());
#else
- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr());
+ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>());
#endif
}
#else // not ENABLE(JIT)
--- a/Source/JavaScriptCore/llint/LLIntThunks.cpp
+++ b/Source/JavaScriptCore/llint/LLIntThunks.cpp
@@ -227,7 +227,7 @@ ALWAYS_INLINE void* untaggedPtr(void* pt
#if COMPILER(MSVC)
return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).untaggedPtr();
#else
- return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr();
+ return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>();
#endif
}
--- a/Source/JavaScriptCore/parser/Nodes.h
+++ b/Source/JavaScriptCore/parser/Nodes.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2024 Apple Inc. All rights reserved.
* Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
* Copyright (C) 2007 Maks Orlovich
* Copyright (C) 2007 Eric Seidel <eric@webkit.org>
@@ -29,6 +29,7 @@
#include "ImplementationVisibility.h"
#include "JITCode.h"
#include "Label.h"
+#include "ModuleScopeData.h"
#include "ParserArena.h"
#include "ParserModes.h"
#include "ParserTokens.h"
@@ -49,7 +50,6 @@ namespace JSC {
class FunctionMetadataNode;
class FunctionParameters;
class ModuleAnalyzer;
- class ModuleScopeData;
class PropertyListNode;
class ReadModifyResolveNode;
class RegisterID;
--- a/Source/JavaScriptCore/runtime/JSCast.h
+++ b/Source/JavaScriptCore/runtime/JSCast.h
@@ -236,7 +236,7 @@ template<typename Target, typename From>
bool inherits(From* from)
{
using Dispatcher = InheritsTraits<Target>;
- return Dispatcher::template inherits(from);
+ return Dispatcher::template inherits<>(from);
}
} // namespace JSCastingHelpers
@@ -245,7 +245,7 @@ template<typename To, typename From>
To jsDynamicCast(From* from)
{
using Dispatcher = JSCastingHelpers::InheritsTraits<typename std::remove_cv<typename std::remove_pointer<To>::type>::type>;
- if (LIKELY(Dispatcher::template inherits(from)))
+ if (LIKELY(Dispatcher::template inherits<>(from)))
return static_cast<To>(from);
return nullptr;
}

16
community/webkit2gtk/cloopfix.patch
View file

@ -1,16 +0,0 @@
Patch-Source: https://github.com/chimera-linux/cports/blob/867816aba3f5/main/webkitgtk/patches/cloopfix.patch
https://github.com/WebKit/WebKit/commit/c1f8a9e819201b59cacc047715b30dd2b4a1df30 was
backported to 2.42 but there's 2 fewer vars here
--
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
@@ -336,8 +336,6 @@
UNUSED_VARIABLE(t2);
UNUSED_VARIABLE(t3);
UNUSED_VARIABLE(t5);
- UNUSED_VARIABLE(t6);
- UNUSED_VARIABLE(t7);
struct StackPointerScope {
StackPointerScope(CLoopStack& stack)

35
community/webkit2gtk/invalid-scope-annotation.patch
View file

@ -1,35 +0,0 @@
Patch-Source: https://github.com/WebKit/WebKit/commit/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch
--
From fff1b1773bff2ef7c3b867ab019d69faa36c010d Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Wed, 3 Jul 2024 13:36:54 -0700
Subject: [PATCH] WebKitDOMEventTarget.h:95: Warning: WebKit2WebExtension:
invalid "scope" annotation: only valid on callback parameters
https://bugs.webkit.org/show_bug.cgi?id=276180
Unreviewed build fix.
Emmanuele recommends using (type gpointer) for the GCallback parameter
of webkit_dom_event_target_remove_event_listener, since it won't be
called and is therefore not functioning as a callback.
* Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h:
Canonical link: https://commits.webkit.org/280639@main
---
.../InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
index 75aac18943865..cbe39b47a30fe 100644
--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
@@ -92,7 +92,7 @@ WEBKIT_DEPRECATED gboolean webkit_dom_event_target_add_event_listener(WebKitDOM
* webkit_dom_event_target_remove_event_listener:
* @target: A #WebKitDOMEventTarget
* @event_name: A #gchar
- * @handler: (scope call): A #GCallback
+ * @handler: (type gpointer): A #GCallback
* @use_capture: A #gboolean
*
* Returns: a #gboolean

19
community/webkit2gtk/riscv64-no-wasm.patch
View file

@ -1,19 +0,0 @@
commit 4f3ac6f8bebe6ed32593d6201f971a47badb7d81
Author: q66 <q66@chimera-linux.org>
Date: Fri Mar 22 00:12:42 2024 +0100
disable wasm on riscv64
diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
index 8460fc0..48a0a0c 100644
--- a/Source/WTF/wtf/PlatformEnable.h
+++ b/Source/WTF/wtf/PlatformEnable.h
@@ -623,7 +623,7 @@
#if CPU(RISCV64)
#undef ENABLE_WEBASSEMBLY
-#define ENABLE_WEBASSEMBLY 1
+#define ENABLE_WEBASSEMBLY 0
#undef ENABLE_WEBASSEMBLY_OMGJIT
#define ENABLE_WEBASSEMBLY_OMGJIT 0
#undef ENABLE_WEBASSEMBLY_BBQJIT