webkit-gtk-2.46.6: start update

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: webkit-gtk-2.46.6: start update
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 9 Feb 2025 21:45:41 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Feb 9 22:45:03 2025 +0100
Changeset:	36882ca4008145e574f0c6f243bcb0c9e0a07bc5

Modified Files:
	webkit-gtk-2.46/Makefile
	webkit-gtk-2.46/distinfo
Added Files:
	webkit-gtk-2.46/TODO
Removed Files:
	webkit-gtk-2.46/patches/patch-Source_WTF_wtf_Platform.h

Log Message:
webkit-gtk-2.46.6: start update

Doesn't finish compilation, see TODO.

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

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                           |  6 +++-
 webkit-gtk-2.46/TODO                               | 33 ++++++++++++++++++++++
 webkit-gtk-2.46/distinfo                           |  7 ++---
 .../patches/patch-Source_WTF_wtf_Platform.h        | 17 -----------
 4 files changed, 41 insertions(+), 22 deletions(-)

diffs:
diff --git a/webkit-gtk-2.46/Makefile b/webkit-gtk-2.46/Makefile
index f195f64cf4..c9370e8b7e 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.5
+DISTNAME=	webkitgtk-2.46.6
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
@@ -23,6 +23,9 @@ USE_LANGUAGES=		c c++
 USE_CXX_FEATURES+=	c++17
 USE_TOOLS+=		automake bash bison flex gdbus-codegen gmake perl pkg-config msgfmt
 
+# this doesn't seem to be using the pkg-config file, which would add this
+CXXFLAGS+=	-I${PREFIX}/lib/gstreamer-1.0/include
+
 # Enabling -gdwarf-2 hits GNU ar limits on file size.
 CTF_SUPPORTED=	no
 
@@ -165,6 +168,7 @@ CHECK_PORTABILITY_SKIP+=	Tools/TestWebKitAPI/Scripts/generate-unified-sources.sh
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../wip/gst-plugins1-gl/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-good/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
 #.include "../../sysutils/libnotify/buildlink3.mk"
diff --git a/webkit-gtk-2.46/TODO b/webkit-gtk-2.46/TODO
new file mode 100644
index 0000000000..3c503c261d
--- /dev/null
+++ b/webkit-gtk-2.46/TODO
@@ -0,0 +1,33 @@
+In file included from /scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/cmake-pkgsrc-build/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-52.cpp:1:
+/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp: In function 'std::optional<WTF::GRefPtr<_GstContext> > WebCore::requestGLContext(const char*)':
+/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1835:40: error: 'class WebCore::PlatformDisplay' has no member named 'gstGLDisplay'; did you mean 'eglDisplay'?
+ 1835 |     auto* gstGLDisplay = sharedDisplay.gstGLDisplay();
+      |                                        ^~~~~~~~~~~~
+      |                                        eglDisplay
+/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1836:40: error: 'class WebCore::PlatformDisplay' has no member named 'gstGLContext'; did you mean 'skiaGLContext'?
+ 1836 |     auto* gstGLContext = sharedDisplay.gstGLContext();
+      |                                        ^~~~~~~~~~~~
+      |                                        skiaGLContext
+/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1841:33: error: 'GST_GL_DISPLAY_CONTEXT_TYPE' was not declared in this scope
+ 1841 |     if (!g_strcmp0(contextType, GST_GL_DISPLAY_CONTEXT_TYPE)) {
+      |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1841:33: note: the macro 'GST_GL_DISPLAY_CONTEXT_TYPE' had not yet been defined
+In file included from /usr/pkg/include/gstreamer-1.0/gst/gl/gl.h:31,
+                 from /scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerVideoFrameConverter.cpp:28,
+                 from /scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/cmake-pkgsrc-build/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-52.cpp:4:
+/usr/pkg/include/gstreamer-1.0/gst/gl/gstgldisplay.h:169: note: it was later defined here
+  169 | #define GST_GL_DISPLAY_CONTEXT_TYPE "gst.gl.GLDisplay"
+      |
+/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1843:9: error: 'gst_context_set_gl_display' was not declared in this scope
+ 1843 |         gst_context_set_gl_display(displayContext.get(), gstGLDisplay);
+      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
+/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1850:49: error: 'GST_TYPE_GL_CONTEXT' was not declared in this scope
+ 1850 |         gst_structure_set(structure, "context", GST_TYPE_GL_CONTEXT, gstGLContext, nullptr);
+      |                                                 ^~~~~~~~~~~~~~~~~~~
+/scratch/wip/webkit-gtk-2.46/work/webkitgtk-2.46.6/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:1850:49: note: the macro 'GST_TYPE_GL_CONTEXT' had not yet been defined
+In file included from /usr/pkg/include/gstreamer-1.0/gst/gl/gl.h:28:
+/usr/pkg/include/gstreamer-1.0/gst/gl/gstglcontext.h:32: note: it was later defined here
+   32 | #define GST_TYPE_GL_CONTEXT         (gst_gl_context_get_type())
+      |
+[4484/7882] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-53.cpp.o
+ninja: build stopped: subcommand failed.
diff --git a/webkit-gtk-2.46/distinfo b/webkit-gtk-2.46/distinfo
index 0c8752eeaf..bb380ec927 100644
--- a/webkit-gtk-2.46/distinfo
+++ b/webkit-gtk-2.46/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-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
+BLAKE2s (webkitgtk-2.46.6.tar.xz) = bca462875a8ff6349f903993835528c32fcc742566cc85d2a119cc7e7af9c3a6
+SHA512 (webkitgtk-2.46.6.tar.xz) = 2b9a004ea1d70e9b5298a0964ed04fea6082ab5f08d81c35c0f653351488b032850476b401694870bda1d202afa239e6726b1f250ce2e11ecf4aae5b98fdd65f
+Size (webkitgtk-2.46.6.tar.xz) = 42914744 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
@@ -10,7 +10,6 @@ SHA1 (patch-Source_ThirdParty_ANGLE_src_libANGLE_renderer_gl_egl_DisplayEGL.cpp)
 SHA1 (patch-Source_ThirdParty_skia_src_gpu_ganesh_GrAutoLocaleSetter.h) = 6a854b85a470ad32aea3bb5f49d4622ba9df1bb6
 SHA1 (patch-Source_ThirdParty_skia_src_ports_SkMemory__malloc.cpp) = e277d988eeaacb7ec8b7f051342b77c5e8ac06a7
 SHA1 (patch-Source_WTF_wtf_InlineASM.h) = d2d6eff085c546b7bcedc4feff69c2f9b636f0bf
-SHA1 (patch-Source_WTF_wtf_Platform.h) = b84c3133ea3e0066a382988b441056dca6b38fa3
 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
diff --git a/webkit-gtk-2.46/patches/patch-Source_WTF_wtf_Platform.h b/webkit-gtk-2.46/patches/patch-Source_WTF_wtf_Platform.h
deleted file mode 100644
index b6ac14d6db..0000000000
--- a/webkit-gtk-2.46/patches/patch-Source_WTF_wtf_Platform.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-From 63f7badbada070ebaadd318b2801818ecf7e7ea0 Mon Sep 17 00:00:00 2001
-From: Don Olmstead <don.olmstead%sony.com@localhost>
-Date: Sat, 26 Oct 2024 08:27:01 -0700
-Subject: [PATCH] Support ICU 76.1 build
-
---- Source/WTF/wtf/Platform.h.orig	2024-11-14 21:16:57.764963130 +0000
-+++ Source/WTF/wtf/Platform.h
-@@ -115,6 +115,7 @@
- /* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
- #define U_HIDE_DEPRECATED_API 1
- #define U_SHOW_CPLUSPLUS_API 0
-+#define U_SHOW_CPLUSPLUS_HEADER_API 0
- #ifdef __cplusplus
- #define UCHAR_TYPE char16_t
- #endif
Prev by Date: lpjs: Update to 0.0.6.24
Next by Date: boron: Add devel/boron version 2.1.0
Previous by Thread: lpjs: Update to 0.0.6.24
Next by Thread: boron: Add devel/boron version 2.1.0
Indexes:
Home | Main Index | Thread Index | Old Index