git: a728ba8a00f4 - main - www/webkit2-gtk: update to 2.46.6

The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a728ba8a00f44557c8c6ca954a0d010d2f9c09f6

commit a728ba8a00f44557c8c6ca954a0d010d2f9c09f6
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2025-03-06 19:09:23 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2025-03-06 19:09:23 +0000

    www/webkit2-gtk: update to 2.46.6
    
    Release notes: https://webkitgtk.org/2025/02/07/webkitgtk2.46.6-released.html
---
 www/webkit2-gtk/Makefile                             | 16 +++++++---------
 www/webkit2-gtk/distinfo                             |  8 +++-----
 .../patch-Source_JavaScriptCore_wasm_WasmBBQJIT.h    | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/www/webkit2-gtk/Makefile b/www/webkit2-gtk/Makefile
index 209bfbdf99ed..37a0c8cde74a 100644
--- a/www/webkit2-gtk/Makefile
+++ b/www/webkit2-gtk/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	webkit
-DISTVERSION=	2.46.5
-PORTREVISION=	3
+DISTVERSION=	2.46.6
 CATEGORIES=	www
 MASTER_SITES=	https://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk_${FLAVOR}
@@ -8,7 +7,6 @@ DISTNAME=	${PORTNAME}gtk-${DISTVERSION}
 DIST_SUBDIR=	gnome
 
 PATCH_SITES=	https://github.com/WebKit/WebKit/commit/
-PATCHFILES=	aa29001ade54425699e1345ce41bbd227dba805c.patch:-p1
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Opensource browser engine using the GTK 3 toolkit
@@ -78,8 +76,8 @@ USE_GNOME+=	gtk40
 
 PLIST=	${.CURDIR}/pkg-plist_${FLAVOR}
 API_VERSION=	6.0
-WEBKIT_LIBRARY_VERSION=	4 10 7
-JAVASCRIPTCORE_LIBRARY_VERSION=	1 3 14
+WEBKIT_LIBRARY_VERSION=	4 10 8
+JAVASCRIPTCORE_LIBRARY_VERSION=	1 3 15
 .else
 USE_GNOME+=	gtk30
 
@@ -90,15 +88,15 @@ LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 
 CMAKE_ON+=	USE_SOUP2
 API_VERSION=	4.0
-WEBKIT_LIBRARY_VERSION=	37 71 7
-JAVASCRIPTCORE_LIBRARY_VERSION=	18 25 14
+WEBKIT_LIBRARY_VERSION=	37 71 8
+JAVASCRIPTCORE_LIBRARY_VERSION=	18 25 15
 .else
 LIB_DEPENDS+=	libsoup-3.0.so:devel/libsoup3
 .endif
 .if ${FLAVOR:M41}
 API_VERSION=	4.1
-WEBKIT_LIBRARY_VERSION=	0 16 7
-JAVASCRIPTCORE_LIBRARY_VERSION=	0 6 14
+WEBKIT_LIBRARY_VERSION=	0 16 8
+JAVASCRIPTCORE_LIBRARY_VERSION=	0 6 15
 .endif
 
 PLIST_SUB=	API_VERSION=${API_VERSION} \
diff --git a/www/webkit2-gtk/distinfo b/www/webkit2-gtk/distinfo
index ef5a2059537c..4d7b2a38f906 100644
--- a/www/webkit2-gtk/distinfo
+++ b/www/webkit2-gtk/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1737410953
-SHA256 (gnome/webkitgtk-2.46.5.tar.xz) = bad4020bb0cfb3e740df3082c2d9cbf67cf4095596588a56aecdde6702137805
-SIZE (gnome/webkitgtk-2.46.5.tar.xz) = 42898600
-SHA256 (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 9b3e89e1a903f8763c3f4149d24e4ab02938b7ff72b6b24e870af0c7efe2d9c4
-SIZE (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 1301
+TIMESTAMP = 1741222652
+SHA256 (gnome/webkitgtk-2.46.6.tar.xz) = f2b31de693220ba9bab76ce6ddfe5b0bfab2515cb2b0a70f3c54d4050766c32b
+SIZE (gnome/webkitgtk-2.46.6.tar.xz) = 42914744
diff --git a/www/webkit2-gtk/files/patch-Source_JavaScriptCore_wasm_WasmBBQJIT.h b/www/webkit2-gtk/files/patch-Source_JavaScriptCore_wasm_WasmBBQJIT.h
new file mode 100644
index 000000000000..981debd03271
--- /dev/null
+++ b/www/webkit2-gtk/files/patch-Source_JavaScriptCore_wasm_WasmBBQJIT.h
@@ -0,0 +1,20 @@
+Excerpt from https://github.com/WebKit/WebKit/commit/406449de0ae5f7558bbcec552b8207ef3e7e6cff
+
+FAILED: Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/wasm/WasmBBQJIT.cpp.o
+/usr/ports/www/webkit2-gtk/work-60/webkitgtk-2.46.6/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp:4545:9: error: use of undeclared identifier 'shouldFuseBranchCompare'
+ 4545 |     if (shouldFuseBranchCompare && isCompareOpType(m_prevOpcode)
+      |         ^
+1 error generated.
+
+--- Source/JavaScriptCore/wasm/WasmBBQJIT.h.orig	2025-02-05 09:13:05 UTC
++++ Source/JavaScriptCore/wasm/WasmBBQJIT.h
+@@ -846,6 +846,9 @@ class BBQJIT { (public)
+ #define LOG_DEDENT() do { if (UNLIKELY(Options::verboseBBQJITInstructions())) { m_loggingIndent -= 2; } } while (false);
+ 
+ public:
++    // FIXME: Support fused branch compare on 32-bit platforms.
++    static constexpr bool shouldFuseBranchCompare = is64Bit();
++
+     static constexpr bool tierSupportsSIMD = true;
+ 
+     BBQJIT(CCallHelpers& jit, const TypeDefinition& signature, BBQCallee& callee, const FunctionData& function, uint32_t functionIndex, const ModuleInformation& info, Vector<UnlinkedWasmToWasmCall>& unlinkedWasmToWasmCalls, MemoryMode mode, InternalFunction* compilation, std::optional<bool> hasExceptionHandlers, unsigned loopIndexForOSREntry, TierUpCount* tierUp);