webkit-gtk: disable JIT for now

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Jan 29 10:49:43 2026 +0100
Changeset:	6726b9095180fef74b8b00b6b8286d29476584bd

Modified Files:
	webkit-gtk/Makefile
	webkit-gtk/distinfo
	webkit-gtk/options.mk
	webkit-gtk/patches/patch-Source_bmalloc_libpas_src_libpas_pas__monotonic__time.c
Added Files:
	webkit-gtk/patches/patch-Source_cmake_WebKitFeatures.cmake

Log Message:
webkit-gtk: disable JIT for now

makes it work for a couple web pages

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6726b9095180fef74b8b00b6b8286d29476584bd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/Makefile                                |  2 ++
 webkit-gtk/distinfo                                |  3 ++-
 webkit-gtk/options.mk                              |  4 ++--
 ...malloc_libpas_src_libpas_pas__monotonic__time.c | 20 ++++++++---------
 .../patch-Source_cmake_WebKitFeatures.cmake        | 26 ++++++++++++++++++++++
 5 files changed, 42 insertions(+), 13 deletions(-)

diffs:
diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile
index a95c02e141..44ef1a0d93 100644
--- a/webkit-gtk/Makefile
+++ b/webkit-gtk/Makefile
@@ -63,6 +63,8 @@ CMAKE_CONFIGURE_ARGS+=		-DUSE_GSTREAMER_GL=ON
 CMAKE_CONFIGURE_ARGS+=		-DUSE_LIBBACKTRACE=OFF
 CMAKE_CONFIGURE_ARGS+=		-DENABLE_WEBDRIVER=OFF
 CMAKE_CONFIGURE_ARGS+=		-DUSE_GTK4=OFF
+# otherwise, libsqlite3.so from ${BUILDLINK_DIR} is hardcoded into some binaries
+CMAKE_CONFIGURE_ARGS+=		-DSQLite3_LIBRARY=${BUILDLINK_PREFIX.sqlite3}/lib/libsqlite3.so
 
 # required for faking a better user-agent
 CMAKE_CONFIGURE_ARGS+=		-DUSER_AGENT_BRANDING="Linux ${MACHINE_ARCH}"
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index 688c8580be..8522d18ccf 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -30,8 +30,9 @@ SHA1 (patch-Source_bmalloc_bmalloc_EligibilityResultInlines.h) = fbf027e2b2897e2
 SHA1 (patch-Source_bmalloc_bmalloc_IsoAllocatorInlines.h) = 9fecc4321ea0e46b09a704ce1f817d0386a0fe36
 SHA1 (patch-Source_bmalloc_bmalloc_bmalloc.h) = 272b35e7a63d7082780917689119f5fe1bd8b000
 SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__committed__pages__vector.h) = c72f85e263e32a9ea6e20a3d88fb56ace9bcd05f
-SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__monotonic__time.c) = d2a212f812b1032a35908de78a2622fd0cf9772e
+SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__monotonic__time.c) = a0afd5cadc261627d521b8d5d60061364f492120
 SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__page__malloc.c) = 02361adfd4f2e6d786759069f9c99c3a83a2699c
 SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__platform.h) = d832e7a7a1bbf8e8de952432e5f411598a72f13d
 SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__random.h) = 161cec597118672f8a7cc4575ff2318284ce13e7
 SHA1 (patch-Source_cmake_FindFlite.cmake) = 83925123ffbac5620865df0fcf2f8e8dfbd3aa57
+SHA1 (patch-Source_cmake_WebKitFeatures.cmake) = 6811f5c3f000900c0404be59a149657fa6b6443b
diff --git a/webkit-gtk/options.mk b/webkit-gtk/options.mk
index d7afb4e14d..9e553faef5 100644
--- a/webkit-gtk/options.mk
+++ b/webkit-gtk/options.mk
@@ -2,7 +2,7 @@
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.webkit-gtk
-PKG_SUPPORTED_OPTIONS=	debug webkit-jit wayland
+PKG_SUPPORTED_OPTIONS=	debug wayland
 PKG_SUGGESTED_OPTIONS=
 .include "../../devel/wayland/platform.mk"
 .if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
@@ -26,7 +26,7 @@ WEBKIT_JIT_MACHINE_PLATFORMS+=	Linux-*-aarch64 Linux-*-mips*
 WEBKIT_JIT_MACHINE_PLATFORMS+=	NetBSD-*-x86_64 NetBSD-*-aarch64
 
 .if !empty(WEBKIT_JIT_MACHINE_PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@)
-PKG_SUGGESTED_OPTIONS+=	webkit-jit
+#PKG_SUGGESTED_OPTIONS+=	webkit-jit
 .endif
 
 .include "../../mk/bsd.options.mk"
diff --git a/webkit-gtk/patches/patch-Source_bmalloc_libpas_src_libpas_pas__monotonic__time.c b/webkit-gtk/patches/patch-Source_bmalloc_libpas_src_libpas_pas__monotonic__time.c
index 61aedc2a4e..3d3c265729 100644
--- a/webkit-gtk/patches/patch-Source_bmalloc_libpas_src_libpas_pas__monotonic__time.c
+++ b/webkit-gtk/patches/patch-Source_bmalloc_libpas_src_libpas_pas__monotonic__time.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- Source/bmalloc/libpas/src/libpas/pas_monotonic_time.c.orig	2025-10-29 10:25:27.891099365 +0000
+--- Source/bmalloc/libpas/src/libpas/pas_monotonic_time.c.orig	2025-08-08 09:17:56.292456200 +0000
 +++ Source/bmalloc/libpas/src/libpas/pas_monotonic_time.c
 @@ -36,7 +36,7 @@
  #include <windows.h>
@@ -11,19 +11,19 @@ $NetBSD$
  #include <time.h>
  #endif
  
-@@ -88,6 +88,15 @@ uint64_t pas_get_current_monotonic_time_
-     return ts.tv_sec * 1.0e9 + ts.tv_nsec;
- }
- 
+@@ -85,6 +85,15 @@ uint64_t pas_get_current_monotonic_time_nanoseconds(vo
+ {
+     struct timespec ts;
+     clock_gettime(CLOCK_MONOTONIC_COARSE, &ts);
++    return ts.tv_sec * 1.0e9 + ts.tv_nsec;
++}
++
 +#elif PAS_OS(OPENBSD) || PAS_OS(NETBSD)
 +
 +uint64_t pas_get_current_monotonic_time_nanoseconds(void)
 +{
 +    struct timespec ts;
 +    clock_gettime(CLOCK_MONOTONIC, &ts);
-+    return ts.tv_sec * 1.0e9 + ts.tv_nsec;
-+}
-+
- #elif PAS_PLATFORM(PLAYSTATION)
+     return ts.tv_sec * 1.0e9 + ts.tv_nsec;
+ }
  
- uint64_t pas_get_current_monotonic_time_nanoseconds(void)
diff --git a/webkit-gtk/patches/patch-Source_cmake_WebKitFeatures.cmake b/webkit-gtk/patches/patch-Source_cmake_WebKitFeatures.cmake
new file mode 100644
index 0000000000..c4582adf18
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_cmake_WebKitFeatures.cmake
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Disabling JIT (performance will be way worse with pages using
+JavaScript, but maybe works).
+Also try to use system malloc.
+
+--- Source/cmake/WebKitFeatures.cmake.orig	2025-08-08 09:17:56.304456000 +0000
++++ Source/cmake/WebKitFeatures.cmake
+@@ -88,7 +88,7 @@ macro(WEBKIT_OPTION_BEGIN)
+             set(ENABLE_C_LOOP_DEFAULT ON)
+             set(ENABLE_SAMPLING_PROFILER_DEFAULT OFF)
+         endif ()
+-    elseif (WTF_CPU_ARM64 OR WTF_CPU_X86_64)
++    elseif (WTF_OS_LINUX AND (WTF_CPU_ARM64 OR WTF_CPU_X86_64))
+         set(ENABLE_JIT_DEFAULT ON)
+         set(ENABLE_FTL_DEFAULT ON)
+         set(USE_SYSTEM_MALLOC_DEFAULT OFF)
+@@ -106,7 +106,7 @@ macro(WEBKIT_OPTION_BEGIN)
+         set(USE_SYSTEM_MALLOC_DEFAULT OFF)
+         set(ENABLE_C_LOOP_DEFAULT ON)
+         set(ENABLE_SAMPLING_PROFILER_DEFAULT OFF)
+-    elseif (WTF_CPU_RISCV64)
++    elseif (WTF_CPU_RISCV64 AND WTF_OS_LINUX)
+         set(ENABLE_JIT_DEFAULT ON)
+         set(ENABLE_FTL_DEFAULT ON)
+         set(USE_SYSTEM_MALLOC_DEFAULT OFF)