webkit-gtk: update to 2.46.5.

[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:		Mon Dec 23 07:35:12 2024 +0100
Changeset:	bc0b09c2a187066fc09c74c5c4e98c3d090635f6

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

Log Message:
webkit-gtk: update to 2.46.5.

Fixes a number of CVEs.

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

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 +++----
 ...ics_gstreamer_mse_MediaSourcePrivateGStreamer.h | 22 ----------------------
 4 files changed, 6 insertions(+), 29 deletions(-)

diffs:
diff --git a/webkit-gtk-2.46/Makefile b/webkit-gtk-2.46/Makefile
index 1557dd4a0e..165f435f5c 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.4
+DISTNAME=	webkitgtk-2.46.5
 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 0b4b33bec4..7795ec5671 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.13
+lib/libjavascriptcoregtk-4.1.so.0.6.14
 lib/libwebkit2gtk-4.1.so
 lib/libwebkit2gtk-4.1.so.0
-lib/libwebkit2gtk-4.1.so.0.16.6
+lib/libwebkit2gtk-4.1.so.0.16.7
 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 8ef5a60d33..0c8752eeaf 100644
--- a/webkit-gtk-2.46/distinfo
+++ b/webkit-gtk-2.46/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-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
+BLAKE2s (webkitgtk-2.46.5.tar.xz) = cec524bc69e068fcae301617a328b045ef7bde97e15225fe086fdb71360ca9f0
+SHA512 (webkitgtk-2.46.5.tar.xz) = 9a0eb018361d407f13b303f66babcdc9960075bf69b83cf2ee8f708e5396cfa9e0a720f77695aea216072392e0603c2dc8ad50e6d56f962d4a52e9cdadf38275
+Size (webkitgtk-2.46.5.tar.xz) = 42898600 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,7 +14,6 @@ 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/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
deleted file mode 100644
index e0c6d852eb..0000000000
--- a/webkit-gtk-2.46/patches/patch-Source_WebCore_platform_graphics_gstreamer_mse_MediaSourcePrivateGStreamer.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$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