* update webkitgtk-6.0 to 2.46.0-2

webkitgtk-6.0/.SRCINFO

@@ -0,0 +1,122 @@
+pkgbase = webkitgtk-6.0
+	pkgdesc = Web content engine for GTK
+	pkgver = 2.46.0
+	pkgrel = 2
+	url = https://webkitgtk.org
+	arch = x86_64
+	arch = powerpc64le
+	arch = powerpc64
+	arch = powerpc
+	arch = riscv64
+	license = AFL-2.0 OR GPL-2.0-or-later
+	license = Apache-2.0
+	license = Apache-2.0 WITH LLVM-exception
+	license = BSD-2-Clause
+	license = BSD-2-Clause-Views
+	license = BSD-3-Clause
+	license = BSD-Source-Code
+	license = BSL-1.0
+	license = bzip2-1.0.6
+	license = GPL-2.0-only
+	license = GPL-3.0-only WITH Autoconf-exception-3.0
+	license = GPL-3.0-or-later WITH Bison-exception-2.2
+	license = ICU
+	license = ISC
+	license = LGPL-2.1-only
+	license = LGPL-2.1-or-later
+	license = MIT
+	license = MPL-1.1
+	license = MPL-2.0
+	license = NCSA
+	license = NCSA OR MIT
+	license = OFL-1.1
+	license = SunPro
+	license = Unicode-TOU
+	makedepends = cmake
+	makedepends = gi-docgen
+	makedepends = glib2-devel
+	makedepends = gobject-introspection
+	makedepends = gperf
+	makedepends = gst-plugins-bad
+	makedepends = ninja
+	makedepends = python
+	makedepends = ruby
+	makedepends = ruby-stdlib
+	makedepends = systemd
+	makedepends = unifdef
+	makedepends = wayland-protocols
+	depends = at-spi2-core
+	depends = atk
+	depends = bubblewrap
+	depends = cairo
+	depends = enchant
+	depends = fontconfig
+	depends = freetype2
+	depends = gcc-libs
+	depends = gdk-pixbuf2
+	depends = glib2
+	depends = glibc
+	depends = gst-plugins-bad-libs
+	depends = gst-plugins-base-libs
+	depends = gstreamer
+	depends = gtk4
+	depends = harfbuzz
+	depends = harfbuzz-icu
+	depends = hyphen
+	depends = icu
+	depends = lcms2
+	depends = libavif
+	depends = libdrm
+	depends = libegl
+	depends = libepoxy
+	depends = libgcrypt
+	depends = libgl
+	depends = libgles
+	depends = libjpeg
+	depends = libjxl
+	depends = libmanette
+	depends = libpng
+	depends = libseccomp
+	depends = libsecret
+	depends = libsoup3
+	depends = libsystemd
+	depends = libtasn1
+	depends = libwebp
+	depends = libx11
+	depends = libxml2
+	depends = libxslt
+	depends = mesa
+	depends = openjpeg2
+	depends = pango
+	depends = sqlite
+	depends = wayland
+	depends = woff2
+	depends = xdg-dbus-proxy
+	depends = zlib
+	options = !lto
+	source = https://webkitgtk.org/releases/webkitgtk-2.46.0.tar.xz
+	source = https://webkitgtk.org/releases/webkitgtk-2.46.0.tar.xz.asc
+	source = 0001-reduce-memory-overheads.patch
+	source = fix-ftbfs-riscv64.patch
+	validpgpkeys = 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B
+	validpgpkeys = 013A0127AC9C65B34FFA62526C1009B693975393
+	sha256sums = d4d433040f190151560c50bde840850089f87bad4fefa9ebdb4aae856a3df43a
+	sha256sums = SKIP
+	sha256sums = 13df7f0b0a61866e767f280bbe77667126ae7de4ad4f463c682040da6366a864
+	sha256sums = b42d36c275e5fbd6da8e0761381d9eac13b2d103a366a61d9d450421948385a3
+	b2sums = a91ff4e00f64bfad8b0493f84a1f3745c167b1db7854b758296a5eb7f966383d540aef91ee14b84d6b4b0710cb2f2281e4bb766968f97dfe3393187b9a7a2b87
+	b2sums = SKIP
+	b2sums = cc16462ce22df999b47ef477d4272ef3df2fbbfe5cdc585f3ce47e56cde65a1d7dd1105e6e7bbff41695f79b6394bc3e403e53a669bb7f456c733ed216372c9b
+	b2sums = cd80efecf12982e9e9335032a433e094614c8b95edce7114d37c6d651ee1f5bb3e331c3911d7901055cd59ca3ed5de38d14e15fab5488d3248bf5899623b2f8c
+
+pkgname = webkitgtk-6.0
+	optdepends = geoclue: Geolocation support
+	optdepends = gst-libav: nonfree media decoding
+	optdepends = gst-plugins-bad: media decoding
+	optdepends = gst-plugins-good: media decoding
+	provides = libjavascriptcoregtk-6.0.so
+	provides = libwebkitgtk-6.0.so
+
+pkgname = webkitgtk-6.0-docs
+	pkgdesc = Web content engine for GTK (documentation)
+	depends = 

webkitgtk-6.0/.nvchecker.toml

@@ -0,0 +1,6 @@
+["webkitgtk-6.0"]
+source = "github"
+github = "WebKit/WebKit"
+use_max_tag = true
+include_regex = 'webkitgtk-\d+\.\d*[02468]\.\d+'
+prefix = "webkitgtk-"

webkitgtk-6.0/0002-webkit-b3jit-regression.patch

@@ -1,62 +0,0 @@
-From 30e1d5e22213fdaca2a29ec3400c927d710a37a8 Mon Sep 17 00:00:00 2001
-From: Thomas Devoogdt <thomas.devoogdt@barco.com>
-Date: Mon, 16 Jan 2023 17:03:30 +0100
-Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix
- !ENABLE(WEBASSEMBLY_B3JIT)
-
-https://bugs.webkit.org/show_bug.cgi?id=250681
-
-Reviewed by NOBODY (OOPS!).
-
-WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT).
-Also, toB3Type and simdScalarType are not defined if it is included.
-
-Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
----
- Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp
-index d06a76023392a..53bf8b16ed869 100644
---- a/Source/JavaScriptCore/b3/B3Validate.cpp
-+++ b/Source/JavaScriptCore/b3/B3Validate.cpp
-@@ -47,6 +47,12 @@
- #include <wtf/StringPrintStream.h>
- #include <wtf/text/CString.h>
- 
-+#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT)
-+#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type))
-+#else
-+#define simdScalarTypeToB3Type(type) B3::Type()
-+#endif
-+
- namespace JSC { namespace B3 {
- 
- namespace {
-@@ -452,7 +458,7 @@ class Validater {
-             case VectorExtractLane:
-                 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
-                 VALIDATE(value->numChildren() == 1, ("At ", *value));
--                VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
-+                VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
-                 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
-                 break;
-             case VectorReplaceLane:
-@@ -460,7 +466,7 @@ class Validater {
-                 VALIDATE(value->numChildren() == 2, ("At ", *value));
-                 VALIDATE(value->type() == V128, ("At ", *value));
-                 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
--                VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
-+                VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
-                 break;
-             case VectorNot:
-             case VectorAbs:
-@@ -475,7 +481,7 @@ class Validater {
-                 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
-                 VALIDATE(value->numChildren() == 1, ("At ", *value));
-                 VALIDATE(value->type() == V128, ("At ", *value));
--                VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
-+                VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
-                 break;
- 
-             case VectorPopcnt:

webkitgtk-6.0/PKGBUILD

@@ -7,12 +7,38 @@ pkgname=(
   webkitgtk-6.0
   webkitgtk-6.0-docs
 )
-pkgver=2.44.2
+pkgver=2.46.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Web content engine for GTK"
 url="https://webkitgtk.org"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
-license=(custom)
+license=(
+  # :sort ui /\v^\s*['"]?/
+  'AFL-2.0 OR GPL-2.0-or-later'
+  Apache-2.0
+  'Apache-2.0 WITH LLVM-exception'
+  BSD-2-Clause
+  BSD-2-Clause-Views
+  BSD-3-Clause
+  BSD-Source-Code
+  BSL-1.0
+  bzip2-1.0.6
+  GPL-2.0-only
+  'GPL-3.0-only WITH Autoconf-exception-3.0'
+  'GPL-3.0-or-later WITH Bison-exception-2.2'
+  ICU
+  ISC
+  LGPL-2.1-only
+  LGPL-2.1-or-later
+  MIT
+  MPL-1.1
+  MPL-2.0
+  NCSA
+  'NCSA OR MIT'
+  OFL-1.1
+  SunPro
+  Unicode-TOU
+)
 depends=(
   at-spi2-core
   atk
@@ -21,7 +47,10 @@ depends=(
   enchant
   fontconfig
   freetype2
+  gcc-libs
+  gdk-pixbuf2
   glib2
+  glibc
   gst-plugins-bad-libs
   gst-plugins-base-libs
   gstreamer
@@ -30,6 +59,7 @@ depends=(
   harfbuzz-icu
   hyphen
   icu
+  lcms2
   libavif
   libdrm
   libegl
@@ -47,60 +77,61 @@ depends=(
   libsystemd
   libtasn1
   libwebp
-  libwpe
   libx11
-  libxcomposite
   libxml2
   libxslt
-  libxt
   mesa
   openjpeg2
+  pango
   sqlite
   wayland
   woff2
-  wpebackend-fdo
   xdg-dbus-proxy
   zlib
 )
 makedepends=(
-  clang
   cmake
   gi-docgen
   glib2-devel
   gobject-introspection
   gperf
   gst-plugins-bad
-  lld
   ninja
   python
   ruby
+  ruby-stdlib
   systemd
   unifdef
   wayland-protocols
 )
+options=(
+  # https://gitlab.archlinux.org/archlinux/packaging/packages/webkit2gtk-4.1/-/issues/1
+  # https://bugs.webkit.org/show_bug.cgi?id=278090
+  !lto
+)
 source=(
   $url/releases/webkitgtk-$pkgver.tar.xz{,.asc}
-  0001-reduce-memory-overheads.patch
+  reduce-memory-overheads.patch
-  0002-webkit-b3jit-regression.patch
+  fix-ftbfs-riscv64.patch
 )
-sha256sums=('523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b'
+sha256sums=('d4d433040f190151560c50bde840850089f87bad4fefa9ebdb4aae856a3df43a'
             'SKIP'
             '13df7f0b0a61866e767f280bbe77667126ae7de4ad4f463c682040da6366a864'
-            '35e71f03b8909bfb017d2ffb4132f9893cc40d8d57720cd8153ce41a13caec93')
+            'b42d36c275e5fbd6da8e0761381d9eac13b2d103a366a61d9d450421948385a3')
-b2sums=('f92ba55adf7bfea165d9950ffbea6f848466be7c6a96b50e0c1c080964415b3e1b44f65c22fa8f64e907e6e7785bd86082452ce15c62ff52811ebc7b8d6b1071'
+b2sums=('a91ff4e00f64bfad8b0493f84a1f3745c167b1db7854b758296a5eb7f966383d540aef91ee14b84d6b4b0710cb2f2281e4bb766968f97dfe3393187b9a7a2b87'
         'SKIP'
         'cc16462ce22df999b47ef477d4272ef3df2fbbfe5cdc585f3ce47e56cde65a1d7dd1105e6e7bbff41695f79b6394bc3e403e53a669bb7f456c733ed216372c9b'
-        'd6c2b589bdf8cf3f75f698bcfa98247dd1fc260859cfefa8842ba11d32e7d2089f97c9b930427ccb6fa37cd58493c6e4c699e3e44327327da0ef1781c32bb7d9')
+        'cd80efecf12982e9e9335032a433e094614c8b95edce7114d37c6d651ee1f5bb3e331c3911d7901055cd59ca3ed5de38d14e15fab5488d3248bf5899623b2f8c')
 validpgpkeys=(
-  013A0127AC9C65B34FFA62526C1009B693975393 # Carlos Garcia Campos <cgarcia@igalia.com>
+  # https://www.webkitgtk.org/verifying.html
   5AA3BC334FD7E3369E7C77B291C559DBE4C9123B # Adrián Pérez de Castro <aperez@igalia.com>
+  013A0127AC9C65B34FFA62526C1009B693975393 # Carlos Garcia Campos <cgarcia@igalia.com>
 )
 
 prepare() {
   cd webkitgtk-$pkgver
-
+  patch -Np1 -i ../reduce-memory-overheads.patch
-  patch -Np1 -i ${srcdir}/0001-reduce-memory-overheads.patch
+  patch -Np1 -i ../fix-ftbfs-riscv64.patch
-  patch -Np1 -i ${srcdir}/0002-webkit-b3jit-regression.patch
 }
 
 build() {
@@ -158,10 +189,6 @@ build() {
 }
 
 package_webkitgtk-6.0() {
-  depends+=(
-    libWPEBackend-fdo-1.0.so
-    libwpe-1.0.so
-  )
   provides+=(
     libjavascriptcoregtk-6.0.so
     libwebkitgtk-6.0.so

webkitgtk-6.0/fix-ftbfs-riscv64.patch

@@ -0,0 +1,40 @@
+From: Alberto Garcia <berto@igalia.com>
+Description: Use WTF_CPU_UNKNOWN when building for riscv64
+ WebKitGTK doesn't build on riscv64 even with the JIT disabled.
+ Treating the CPU as unknown is perhaps a bit severe, but it allows us
+ to get the build done until someone steps up to maintain this
+ properly.
+Bug: https://bugs.webkit.org/show_bug.cgi?id=271371
+Forwarded: no
+Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/PlatformCPU.h
++++ webkitgtk/Source/WTF/wtf/PlatformCPU.h
+@@ -292,14 +292,6 @@
+ 
+ #endif /* ARM */
+ 
+-/* CPU(RISCV64) - RISC-V 64-bit */
+-#if    defined(__riscv) \
+-    && defined(__riscv_xlen) \
+-    && (__riscv_xlen == 64)
+-#define WTF_CPU_RISCV64 1
+-#define WTF_CPU_KNOWN 1
+-#endif
+-
+ #if !CPU(KNOWN)
+ #define WTF_CPU_UNKNOWN 1
+ #endif
+Index: webkitgtk/Source/cmake/WebKitCommon.cmake
+===================================================================
+--- webkitgtk.orig/Source/cmake/WebKitCommon.cmake
++++ webkitgtk/Source/cmake/WebKitCommon.cmake
+@@ -127,8 +127,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+         set(WTF_CPU_PPC64 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
+         set(WTF_CPU_PPC64LE 1)
+-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
+-        set(WTF_CPU_RISCV64 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
+         set(WTF_CPU_LOONGARCH64 1)
+     else ()

webkitgtk-6.0/keys/pgp/013A0127AC9C65B34FFA62526C1009B693975393.asc

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+303oaXL9TFcjuZuqXoz/ASk=
+=t3Rv
+-----END PGP PUBLIC KEY BLOCK-----

webkitgtk-6.0/keys/pgp/5AA3BC334FD7E3369E7C77B291C559DBE4C9123B.asc

@@ -11,12 +11,12 @@ GgSEsxmXNEhBvXCjCH4CDDGPXVuqXpHB/E38JW75irXVVSr47iTx0XaBRzGLcHyM
 gT1b/yYCl10FV/47u8XaOP0BP9cQ2A9PY/vRTKRDNbe4plJSRbQsQWRyacOhbiBQ
 w6lyZXogZGUgQ2FzdHJvIDxhcGVyZXpAaWdhbGlhLmNvbT6IgQQTEQoAQQIbIwIe
 AQIXgAIZAQULCQgHAwUVCgkICwUWAgMBABYhBFqjvDNP1+M2nnx3spHFWdvkyRI7
-BQJifDWsBQkd+p6nAAoJEJHFWdvkyRI7gTcAnAmeD883uqVIxbEo3BmNWxnIUmRz
+BQJmHC0aBQkhmpYVAAoJEJHFWdvkyRI7I/4AnRiipxNUTb+RNgfBg6JoOIGB5Jda
-AJ9zuPzdmW+bVRh12wO/f89BWSCuEbQ+QWRyacOhbiBQw6lyZXogZGUgQ2FzdHJv
+AJsHzFmwKNOIRlnwROD8vAedgKw0krQ+QWRyacOhbiBQw6lyZXogZGUgQ2FzdHJv
 IChwZXJzb25hbCkgPGFkcmlhbkBwZXJlemRlY2FzdHJvLm9yZz6IfgQTEQoAPgIb
 IwIeAQIXgAULCQgHAwUVCgkICwUWAgMBABYhBFqjvDNP1+M2nnx3spHFWdvkyRI7
-BQJifDWwBQkd+p6nAAoJEJHFWdvkyRI7qh4AnAxik+URVJedxbFeIyP92Sjxuij8
+BQJmHC0aBQkhmpYVAAoJEJHFWdvkyRI7KggAnAvp5cT72GX25lYI+utMoE34w1WZ
-AJ0Xf+PU/vAu1aIz70Cmx+Ss8hwcHbkEDQRIQ/4FEBAA1OG3mSJRBu/P/6Q2W+hq
+AJ97KjQmUCG+a54Ne1pnhhq9YKFcMbkEDQRIQ/4FEBAA1OG3mSJRBu/P/6Q2W+hq
 lPYr5dXcwu1AOKnIVJc6xsyXgwXnxCeQXmwaqUZncSDYi38+l/yTnRRTIXPkf58t
 UJaECnw0PZPwH0W0eX5zMzcYF66G6cMvSKw/+UyTs2OCBEIGCDfAwgTWJsG1b9Wp
 INqCm9WeLPiftG9DHX+ue6uD7KSuJ05wJu2r06ZwTT7gvJX46ay1AoStdA6Wyn9b
@@ -40,5 +40,5 @@ MNe7knc668Tt9xaaO1xqP6m0ucA6d3RDrUv6FMgQbGSs7eWptoaqhHAWXeIIqVV5
 IV855Gd67VBdxVoVZ4Ckrrp2+c+m9+yAH+P0GnilEPJJVEvvgTomcQkh5lQmO3zi
 H+0elIHwiEkEGBECAAkFAkhD/gUCGwwACgkQkcVZ2+TJEjtbuACfSaae99WLTJx0
 0513z7nYjwW7R68An0kg178Aa4C1DvTHVBcSsiVXEJQY
-=P5qJ
+=508z
 -----END PGP PUBLIC KEY BLOCK-----