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

--- pkgsrc/www/webkit-gtk/Makefile	2021/12/29 08:59:16	1.218
+++ pkgsrc/www/webkit-gtk/Makefile	2024/06/25 12:09:38	1.261
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.218 2021/12/29 08:59:16 leot Exp $
+# $NetBSD: Makefile,v 1.261 2024/06/25 12:09:38 mef Exp $
 
-DISTNAME=	webkitgtk-2.34.3
+DISTNAME=	webkitgtk-2.36.8
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=	1
+PKGREVISION=	15
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -16,22 +16,15 @@ LICENSE=	2-clause-bsd AND gnu-lgpl-v2
 NOT_FOR_PLATFORM=	NetBSD-[1-6].*-*
 
 TOOL_DEPENDS+=	gettext-tools>=0.18:../../devel/gettext-tools
-TOOL_DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-USE_CMAKE=	yes
-USE_LANGUAGES=	c c++11
-USE_TOOLS+=	automake bash bison flex gmake perl pkg-config msgfmt
+USE_LANGUAGES=	c c++17
+USE_TOOLS+=	automake bash bison flex gdbus-codegen gmake perl pkg-config msgfmt
 
 # Enabling -gdwarf-2 hits GNU ar limits on file size.
 CTF_SUPPORTED=	no
 
-# GCC >= 7.3.0 is required, checked via CMakeLists.txt
-GCC_REQD+=		7
-USE_GCC_RUNTIME=	yes
-
-# Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
-# versions of ld.gold.
-CMAKE_ARGS+=	-DUSE_LD_GOLD=OFF
+# GCC >= 8 is required, it no longer builds with lower versions.
+GCC_REQD+=		8
 
 PKGCONFIG_OVERRIDE+=	Source/JavaScriptCore/javascriptcoregtk.pc.in
 PKGCONFIG_OVERRIDE+=	Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
@@ -43,12 +36,18 @@ CMAKE_ARGS+=		-DENABLE_X11_TARGET=ON
 CMAKE_ARGS+=		-DENABLE_MINIBROWSER=ON
 CMAKE_ARGS+=		-DENABLE_GAMEPAD=OFF
 CMAKE_ARGS+=		-DENABLE_GEOLOCATION=OFF
+CMAKE_ARGS+=		-DENABLE_INTROSPECTION=ON
+CMAKE_ARGS+=		-DENABLE_JOURNALD_LOG=OFF
 CMAKE_ARGS+=		-DENABLE_BUBBLEWRAP_SANDBOX=OFF
 CMAKE_ARGS+=		-DUSE_GSTREAMER_GL=OFF
 CMAKE_ARGS+=		-DUSE_LIBHYPHEN=OFF
 CMAKE_ARGS+=		-DUSE_OPENJPEG=OFF
 CMAKE_ARGS+=		-DUSE_SOUP2=ON
-CMAKE_ARGS+=		-DUSE_SYSTEMD=OFF
+
+.include "../../mk/bsd.prefs.mk"
+.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64*}
+CMAKE_ARGS+=		-DAVOID_INT128=ON
+.endif
 
 REPLACE_PERL+=	Source/JavaScriptCore/Scripts/*.pl
 REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table
@@ -100,7 +99,7 @@ REPLACE_RUBY+=		Source/WebKit/Scripts/*.
 
 SUBST_CLASSES+=		python
 SUBST_FILES.python+=	Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
-SUBST_SED.python+=	-e 's,\(.\)python.;,\1${PYTHONBIN}\1;,'
+SUBST_SED.python+=	-e 's,"python3","${PYTHONBIN}",'
 SUBST_STAGE.python=	pre-configure
 SUBST_MESSAGE.python=	Fixing path to python binary.
 
@@ -110,6 +109,7 @@ TOOL_DEPENDS+=	${RUBY_BASE}>=${RUBY_VERS
 CMAKE_ARGS+=	-DRUBY_EXECUTABLE=${RUBY}
 
 PYTHON_FOR_BUILD_ONLY=	yes
+.include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/application.mk"
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHONBIN}
 
@@ -127,29 +127,37 @@ CFLAGS+=	-DRELEASE_WITHOUT_OPTIMIZATIONS
 NOT_PAX_MPROTECT_SAFE+=	libexec/webkit2gtk-4.0/WebKitWebProcess
 NOT_PAX_MPROTECT_SAFE+=	libexec/webkit2gtk-4.0/jsc
 
+CHECK_PORTABILITY_SKIP+=	Source/JavaScriptCore/Scripts/create-symlink-to-altroot.sh
+CHECK_PORTABILITY_SKIP+=	Source/WebCore/Scripts/create-symlink-to-altroot.sh
+CHECK_PORTABILITY_SKIP+=	Source/WebKit/Scripts/create-symlink-to-altroot.sh
+CHECK_PORTABILITY_SKIP+=	Source/WebKit/Scripts/generate-feature-flags-plist.sh
+
 .include "options.mk"
 
+.include "../../devel/cmake/build.mk"
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+=	build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/harfbuzz-icu/buildlink3.mk"
 .include "../../fonts/woff2/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
 .include "../../graphics/png/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gstreamer1+=	gstreamer1>=1.0.3
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gst-plugins1-base+=	gst-plugins1-base>=1.0.3
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-good/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../security/libsecret/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"