webkit-gtk-2.46: update to 2.46.4

[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:		Sun Dec 8 11:46:20 2024 +0100
Changeset:	ddc62f50fb69b7165e58b71af8801a0ac68ebeba

Modified Files:
	webkit-gtk-2.46/Makefile
	webkit-gtk-2.46/PLIST
	webkit-gtk-2.46/distinfo
	webkit-gtk-2.46/options.mk
Added Files:
	webkit-gtk-2.46/patches/patch-Source_WebCore_platform_graphics_gstreamer_mse_MediaSourcePrivateGStreamer.h

Log Message:
webkit-gtk-2.46: update to 2.46.4

Still often coredumps in JSC Code.

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

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

diffstat:
 webkit-gtk-2.46/Makefile                           |  2 +-
 webkit-gtk-2.46/PLIST                              |  4 ++--
 webkit-gtk-2.46/distinfo                           |  7 ++++---
 webkit-gtk-2.46/options.mk                         |  1 -
 ...ics_gstreamer_mse_MediaSourcePrivateGStreamer.h | 22 ++++++++++++++++++++++
 5 files changed, 29 insertions(+), 7 deletions(-)

diffs:
diff --git a/webkit-gtk-2.46/Makefile b/webkit-gtk-2.46/Makefile
index 3eb22e3009..1557dd4a0e 100644
--- a/webkit-gtk-2.46/Makefile
+++ b/webkit-gtk-2.46/Makefile
@@ -3,7 +3,7 @@
 # Some environment variables that can help debugging this:
 # https://trac.webkit.org/wiki/EnvironmentVariables
 
-DISTNAME=	webkitgtk-2.46.3
+DISTNAME=	webkitgtk-2.46.4
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
diff --git a/webkit-gtk-2.46/PLIST b/webkit-gtk-2.46/PLIST
index cd54e1bceb..0b4b33bec4 100644
--- a/webkit-gtk-2.46/PLIST
+++ b/webkit-gtk-2.46/PLIST
@@ -223,10 +223,10 @@ lib/girepository-1.0/WebKit2-4.1.typelib
 lib/girepository-1.0/WebKit2WebExtension-4.1.typelib
 lib/libjavascriptcoregtk-4.1.so
 lib/libjavascriptcoregtk-4.1.so.0
-lib/libjavascriptcoregtk-4.1.so.0.6.12
+lib/libjavascriptcoregtk-4.1.so.0.6.13
 lib/libwebkit2gtk-4.1.so
 lib/libwebkit2gtk-4.1.so.0
-lib/libwebkit2gtk-4.1.so.0.16.5
+lib/libwebkit2gtk-4.1.so.0.16.6
 lib/pkgconfig/javascriptcoregtk-4.1.pc
 lib/pkgconfig/webkit2gtk-4.1.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.1.pc
diff --git a/webkit-gtk-2.46/distinfo b/webkit-gtk-2.46/distinfo
index 47194745d2..8ef5a60d33 100644
--- a/webkit-gtk-2.46/distinfo
+++ b/webkit-gtk-2.46/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (webkitgtk-2.46.3.tar.xz) = 828a3f896542ddc2b34c370576ec9c4a50be736cbe59c464f96fc5d97dbb714b
-SHA512 (webkitgtk-2.46.3.tar.xz) = efec6e92bbea3379cf3bd1aff7d91aee3f028dcd1bcfbe7120d5ded30ada1541469fc5cd7897cb375e03a55e59d268f915c2a35345a84192b14971ac4339719f
-Size (webkitgtk-2.46.3.tar.xz) = 42820196 bytes
+BLAKE2s (webkitgtk-2.46.4.tar.xz) = abc56b48d6acd687945cc5ae3f486c148044c8e5b005f52d1acce2b49655e229
+SHA512 (webkitgtk-2.46.4.tar.xz) = 9f3967524ef2ca3242609d4e49e773d33bb944f109a6fbf30d2cc3179eb563df59044b2bc627bcdc9991e09e9d3041b9dc5c22c857227385508ada6276829e29
+Size (webkitgtk-2.46.4.tar.xz) = 42899016 bytes
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_SimpleMutex.h) = 6cd83b9ec476ed39adecec6b30e898bda8e5b76d
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_platform.h) = 2fda057edc3dde3356f0663ec5aa52cb61fb1229
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_system__utils__linux.cpp) = 7da7a59e2c0ab0c9fa92d746aceb11f1aab3290d
@@ -14,6 +14,7 @@ SHA1 (patch-Source_WTF_wtf_Platform.h) = b84c3133ea3e0066a382988b441056dca6b38fa
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = d11d941d8ca446b9cd8a452b1eda43497a44c3c9
 SHA1 (patch-Source_WTF_wtf_glib_FileSystemGlib.cpp) = a46ae871e2c0919da94bcb14a2b94d0e5a911922
 SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = 1549a9bbbc11129e42995719d592ab747413eef6
+SHA1 (patch-Source_WebCore_platform_graphics_gstreamer_mse_MediaSourcePrivateGStreamer.h) = f5550c49b44124d95d3321f2aed7d3da40aa7027
 SHA1 (patch-Source_WebCore_rendering_RenderBox.h) = f3aa267788a218d9b5cb4d58715abbbc3444d2b6
 SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = fd50d400a5410eb76810f838e4147295acc402ad
 SHA1 (patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib.cpp) = deebf7ac3d75f55f2000f496702623661da4561a
diff --git a/webkit-gtk-2.46/options.mk b/webkit-gtk-2.46/options.mk
index 696c17351d..759e06b5d7 100644
--- a/webkit-gtk-2.46/options.mk
+++ b/webkit-gtk-2.46/options.mk
@@ -64,7 +64,6 @@ CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 #
 .if !empty(PKG_OPTIONS:Mwayland)
 CMAKE_CONFIGURE_ARGS+=	-DENABLE_WAYLAND_TARGET=ON
-CMAKE_CONFIGURE_ARGS+=	-DUSE_WPE_RENDERER=OFF # TODO
 .include "../../devel/wayland/buildlink3.mk"
 .else
 CMAKE_CONFIGURE_ARGS+=	-DENABLE_WAYLAND_TARGET=OFF
diff --git a/webkit-gtk-2.46/patches/patch-Source_WebCore_platform_graphics_gstreamer_mse_MediaSourcePrivateGStreamer.h b/webkit-gtk-2.46/patches/patch-Source_WebCore_platform_graphics_gstreamer_mse_MediaSourcePrivateGStreamer.h
new file mode 100644
index 0000000000..e0c6d852eb
--- /dev/null
+++ b/webkit-gtk-2.46/patches/patch-Source_WebCore_platform_graphics_gstreamer_mse_MediaSourcePrivateGStreamer.h
@@ -0,0 +1,22 @@
+$NetBSD$
+
+/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.4/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.cpp:177:9: error: 'm_trackIdRegistry' was not declared in this scope
+  177 |     if (m_trackIdRegistry.add(preferredId).isNewEntry) {
+      |         ^~~~~~~~~~~~~~~~~
+
+--- Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h.orig	2024-12-08 10:25:49.929155900 +0000
++++ Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h
+@@ -94,12 +94,12 @@ private:
+     Ref<const Logger> m_logger;
+     const void* m_logIdentifier;
+     uint64_t m_nextSourceBufferID { 0 };
++#endif
+ 
+     // Stores known track IDs, so we can work around ID collisions between multiple source buffers.
+     // The registry is placed here to enforce ID uniqueness specifically by player, not by process,
+     // since its not an issue if multiple players use the same ID, and we want to preserve IDs as much as possible.
+     HashSet<TrackID, WTF::IntHash<TrackID>, WTF::UnsignedWithZeroKeyHashTraits<TrackID>> m_trackIdRegistry;
+-#endif
+ };
+ 
+ } // namespace WebCore