webkit-gtk-2.46: update to 2.48.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:		Sat Aug 23 15:37:12 2025 +0200
Changeset:	4f68c48fbe6b289ff6dea282b5a336d731d43231

Modified Files:
	webkit-gtk-2.46/Makefile
	webkit-gtk-2.46/PLIST
	webkit-gtk-2.46/TODO
	webkit-gtk-2.46/distinfo
Added Files:
	webkit-gtk-2.46/patches/patch-Source_WebCore_rendering_RenderBox.h
	webkit-gtk-2.46/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp

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

Builds, but expects libsqlite3.so in buildlink directory.

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

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/TODO                                      |  2 +-
 webkit-gtk-2.46/distinfo                                  |  8 +++++---
 .../patches/patch-Source_WebCore_rendering_RenderBox.h    | 15 +++++++++++++++
 ...h-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp | 15 +++++++++++++++
 6 files changed, 39 insertions(+), 7 deletions(-)

diffs:
diff --git a/webkit-gtk-2.46/Makefile b/webkit-gtk-2.46/Makefile
index 3f093b5c41..242367bb21 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.48.2
+DISTNAME=	webkitgtk-2.48.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 f41199c917..f5815647bc 100644
--- a/webkit-gtk-2.46/PLIST
+++ b/webkit-gtk-2.46/PLIST
@@ -224,10 +224,10 @@ lib/girepository-1.0/WebKit2-4.1.typelib
 lib/girepository-1.0/WebKit2WebExtension-4.1.typelib
 lib/libjavascriptcoregtk-4.1.${RUBY_DLEXT}
 lib/libjavascriptcoregtk-4.1.so.0
-lib/libjavascriptcoregtk-4.1.so.0.8.5
+lib/libjavascriptcoregtk-4.1.so.0.8.8
 lib/libwebkit2gtk-4.1.${RUBY_DLEXT}
 lib/libwebkit2gtk-4.1.so.0
-lib/libwebkit2gtk-4.1.so.0.17.7
+lib/libwebkit2gtk-4.1.so.0.17.10
 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/TODO b/webkit-gtk-2.46/TODO
index d9543d3ffc..9b18cb3d0d 100644
--- a/webkit-gtk-2.46/TODO
+++ b/webkit-gtk-2.46/TODO
@@ -1,4 +1,4 @@
-Build with 'JPEG_DEFAULT=libjpeg-turbo' in /etc/mk.conf
+pkg_add: webkit-gtk-2.48.5: missing required library: /scratch/wip/webkit-gtk-2.46/work/.buildlink/lib/libsqlite3.so
 
 Test with $PREFIX/libexec/webkit2gtk-4.1/MiniBrowser:
 
diff --git a/webkit-gtk-2.46/distinfo b/webkit-gtk-2.46/distinfo
index 58d825d8ff..bf8ec3e8ef 100644
--- a/webkit-gtk-2.46/distinfo
+++ b/webkit-gtk-2.46/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (webkitgtk-2.48.2.tar.xz) = c3a05c85df4ee8bafde03a8b5cbb2af9a33c464e0a254ea5c149dcc19ca4dfa4
-SHA512 (webkitgtk-2.48.2.tar.xz) = 712342e2f8bfaa479dc846d91ca1e02008286b438115789555bfff1dd3b07e0887d6a2a064afd1a5e85d7ae85d68e59daf8b81888c93c1a7b40cfa9048b3b2da
-Size (webkitgtk-2.48.2.tar.xz) = 44168288 bytes
+BLAKE2s (webkitgtk-2.48.5.tar.xz) = 1cdfa9ed42b9ae1c1611b0d2043dc8bb1aefb5b136ba962950483040a55f5910
+SHA512 (webkitgtk-2.48.5.tar.xz) = 70ee8f58a354cf6d0b1345954ed07c1e49d886f353d4fab945a3d2fc03116726af05454d4b5460f0fe4f5c3d042bb921fc5b43a85474624545afd9acc1c0fc8d
+Size (webkitgtk-2.48.5.tar.xz) = 44131936 bytes
 SHA1 (patch-Source_JavaScriptCore_runtime_JSCBytecodeCacheVersion.cpp) = a3e2ddaceb3354069108b033f97ee8f2da2cb056
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_SimpleMutex.h) = 6cd83b9ec476ed39adecec6b30e898bda8e5b76d
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_platform.h) = 2fda057edc3dde3356f0663ec5aa52cb61fb1229
@@ -14,6 +14,8 @@ SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 35afdd5143f4a2df8a5554a0b0b35141a8784c
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = 905b2b4bf4b8c90cf91eb8ecf1d414013cc3bcbb
 SHA1 (patch-Source_WTF_wtf_glib_FileSystemGlib.cpp) = a46ae871e2c0919da94bcb14a2b94d0e5a911922
 SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = 1549a9bbbc11129e42995719d592ab747413eef6
+SHA1 (patch-Source_WebCore_rendering_RenderBox.h) = 6a6fc94f1a057723ec404e67713f1f0025cae445
+SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = 11e1efcbf2f1832b38c7b649db7a156c1fe2a2c8
 SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = dde292d5a8be48502253930e42126edee8f85460
 SHA1 (patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib.cpp) = 45a215a2b7a913b6fba16ff91276e2c9779e06be
 SHA1 (patch-Source_WebKit_UIProcess_gtk_AcceleratedBackingStoreDMABuf.cpp) = c97c28f22b3792643b98f268e6b6bc247485a18a
diff --git a/webkit-gtk-2.46/patches/patch-Source_WebCore_rendering_RenderBox.h b/webkit-gtk-2.46/patches/patch-Source_WebCore_rendering_RenderBox.h
new file mode 100644
index 0000000000..2eee8a7625
--- /dev/null
+++ b/webkit-gtk-2.46/patches/patch-Source_WebCore_rendering_RenderBox.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+RenderBox.h:701:85: error: 'isnan' was not declared in this scope; did you mean 'std::isnan'?
+
+--- Source/WebCore/rendering/RenderBox.h.orig	2025-08-23 12:57:50.364064667 +0000
++++ Source/WebCore/rendering/RenderBox.h
+@@ -698,7 +698,7 @@ protected:
+ 
+     void computePreferredLogicalWidths(const Length& minLogicalWidth, const Length& maxLogicalWidth, LayoutUnit borderAndPaddingLogicalWidth);
+     
+-    bool isAspectRatioDegenerate(double aspectRatio) const { return !aspectRatio || isnan(aspectRatio); }
++    bool isAspectRatioDegenerate(double aspectRatio) const { return !aspectRatio || std::isnan(aspectRatio); }
+ 
+     bool overflowChangesMayAffectLayout() const final;
+ 
diff --git a/webkit-gtk-2.46/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp b/webkit-gtk-2.46/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
new file mode 100644
index 0000000000..1958dde432
--- /dev/null
+++ b/webkit-gtk-2.46/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+ShapeOutsideInfo.cpp:140:16: error: 'isnan' was not declared in this scope; did you mean 'std::isnan'?
+
+--- Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp.orig	2025-08-23 13:14:21.009366295 +0000
++++ Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp
+@@ -137,7 +137,7 @@ Ref<const LayoutShape> makeShapeForShape
+ 
+     auto margin = [&] {
+         auto shapeMargin = floatValueForLength(style.shapeMargin(), containingBlock.contentBoxWidth());
+-        return isnan(shapeMargin) ? 0.0f : shapeMargin;
++        return std::isnan(shapeMargin) ? 0.0f : shapeMargin;
+     }();
+ 
+