www/webkit2-gtk: update to 2.46.5

Changelog: https://github.com/WebKit/WebKit/blob/webkitgtk-2.46.5/Source/WebKit/gtk/NEWS Now consolidated into one port with flavours since the codebase is the same, just linked with different libraries resulting in different SONAMEs and APIs. SONAMEs/flavours: * GTK3 + libsoup = libwebkit2gtk-4.0 (40) * GTK3 + libsoup3 = libwebkit2gtk-4.1 (41) * GTK4 + libsoup3 = libwebkitgtk-6.0 (60) Despite upstream's recommendation to use clang for better skia optimisation, this port now USE_GCC due to extensive std::pair copy constructor use that is not trivial to continue patching to stay working with our libc++ version 1 ABI. See review D35327 for some details. Reported by: eduardo PR: 275914 Differential Revision: https://reviews.freebsd.org/D45878
2025-04-28 01:26:39 -04:00 · 2025-01-20 17:01:13 -05:00 · 2025-01-20 17:01:13 -05:00 · 9431001288
commit 9431001288
parent af73e96a3b
143 changed files with 6156 additions and 6006 deletions
--- a/2
+++ b/2
@ -4029,3 +4029,5 @@ net/libproxy-pacrunner||2025-01-19|Completely rewritten, plugins now built direc
 net/libproxy-perl||2025-01-19|Completely rewritten, plugins now built directly into the library
 net/libproxy-python||2025-01-19|Completely rewritten, plugins now built directly into the library
 net/libproxy-webkit3||2025-01-19|Completely rewritten, plugins now built directly into the library
 www/webkit2-gtk3|www/webkit2-gtk@40|2025-01-20|Flavoured
 www/webkit2-gtk4|www/webkit2-gtk@60|2025-01-20|Flavoured
--- a/audio/gsequencer/Makefile
+++ b/audio/gsequencer/Makefile
@ -26,7 +26,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libsoup-3.0.so:devel/libsoup3 \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libvulkan.so:graphics/vulkan-loader \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	dssi>0:audio/dssi
 USES=		autoreconf desktop-file-utils gettext-runtime gettext-tools gmake gnome gstreamer \
--- a/cad/PrusaSlicer/Makefile
+++ b/cad/PrusaSlicer/Makefile
@ -41,7 +41,7 @@ LIB_DEPENDS+=	libbgcode_convert.so:cad/libbgcode \
 		libavcodec.so:multimedia/ffmpeg4 \
 		libharfbuzz.so:print/harfbuzz \
 		libwayland-egl.so:graphics/wayland \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libsoup-2.4.so:devel/libsoup \
 		libjavascriptcoregtk-4.0.so:www/webkit2-gtk3
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@ -21,7 +21,7 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libical.so:devel/libical \
 		libnss3.so:security/nss \
 		libicudata.so:devel/icu \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libp11-kit.so:security/p11-kit \
 		libnspr4.so:devel/nspr \
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libtracker-sparql-3.0.so:sysutils/tracker3 \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libical.so:devel/libical \
 		libuuid.so:misc/e2fsprogs-libuuid \
--- a/deskutils/bookworm/Makefile
+++ b/deskutils/bookworm/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	libappstream-glib.so:devel/appstream-glib \
 		libgranite.so:x11-toolkits/granite \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	bash:shells/bash \
 		pdftohtml:graphics/poppler-utils \
 		unar:archivers/unarchiver \
--- a/deskutils/foliate/Makefile
+++ b/deskutils/foliate/Makefile
@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	appstream-util:devel/appstream-glib \
 		gjs-console:lang/gjs
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	gjs-console:lang/gjs
 USES=		desktop-file-utils gnome localbase meson python shebangfix
--- a/deskutils/gnome-initial-setup/Makefile
+++ b/deskutils/gnome-initial-setup/Makefile
@ -23,7 +23,7 @@ LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libpwquality.so:security/libpwquality \
 		librest-1.0.so:net/librest1 \
-		libwebkit2gtk-5.0.so:www/webkit2-gtk4
+		libwebkit2gtk-6.0.so:www/webkit2-gtk@60
 RUN_DEPENDS=	gdm>=3.0.0:x11/gdm \
 		krb5>0:security/krb5
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	libqof.so:databases/qof \
 		libsoup-2.4.so:devel/libsoup \
 		libguile-2.2.so:lang/guile2 \
 		libharfbuzz.so:print/harfbuzz \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		autoreconf desktop-file-utils gettext gmake gnome libtool pathfix pkgconfig xorg
 USE_GITHUB=	yes
--- a/deskutils/meteo/Makefile
+++ b/deskutils/meteo/Makefile
@ -13,7 +13,7 @@ BUILD_DEPENDS=	appstream-util:devel/appstream-glib
 LIB_DEPENDS=	libappindicator3.so:devel/libappindicator \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		compiler:c11 gettext gnome meson pkgconfig python:build \
 		shebangfix vala:build
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@ -11,7 +11,7 @@ WWW=		https://rednotebook.app
 LICENSE=	GPLv3+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		gettext-tools:build gnome python
 USE_GNOME=	gtk30 gtksourceview3
--- a/deskutils/showdown/Makefile
+++ b/deskutils/showdown/Makefile
@ -11,7 +11,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmarkdown.a:textproc/discount
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		compiler:c++11-lang desktop-file-utils gmake gnome \
 		pkgconfig vala:build xorg
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libamtk-5.so:x11-toolkits/amtk
 PORTSCOUT=	limitw:1,even
--- a/devel/geany-plugin-markdown/Makefile
+++ b/devel/geany-plugin-markdown/Makefile
@ -7,7 +7,7 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 WWW=		https://plugins.geany.org/markdown.html
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 OPTIONS_DEFINE=	DOCS
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@ -42,6 +42,6 @@ PYTHON_USE=		GNOME=pygobject3
 WEBKIT_DESC=		Webkit glade support
 WEBKIT_MESON_ENABLED=	webkit2gtk
 WEBKIT_LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
-			libwebkit2gtk-4.0.so:www/webkit2-gtk3
+			libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 .include <bsd.port.mk>
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@ -32,7 +32,7 @@ LIB_DEPENDS=	libcmark.so:textproc/cmark \
 		libportal-gtk3.so:deskutils/libportal-gtk3 \
 		libsoup-2.4.so:devel/libsoup \
 		libtemplate_glib-1.0.so:devel/template-glib \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 PORTSCOUT=	limitw:1,even
 PORTDOCS=	*
--- a/devel/juce/Makefile
+++ b/devel/juce/Makefile
@ -22,7 +22,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
-		libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 \
+		libjavascriptcoregtk-4.0.so:www/webkit2-gtk@40 \
 		libpng16.so:graphics/png \
 		libsoup-2.4.so:devel/libsoup \
 		libsysinfo.so:devel/libsysinfo
@ -59,7 +59,7 @@ DEMOS_CMAKE_BOOL=	JUCE_BUILD_EXAMPLES
 DEMOS_LDFLAGS=		-lexecinfo
 DEMOS_USE=		GNOME=atk,cairo,gdkpixbuf2,gtk30,pango
 DEMOS_LIB_DEPENDS=	libcurl.so:ftp/curl \
-			libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+			libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 			libsoup-2.4.so:devel/libsoup
 DEMO_FILES=	\
 	AnalyticsCollectionDemo AnimationAppDemo AnimationDemo AudioAppDemo AudioLatencyDemo AudioPlaybackDemo AudioPluginDemo AudioRecordingDemo AudioSettingsDemo AudioSynthesiserDemo \
--- a/devel/juce706/Makefile
+++ b/devel/juce706/Makefile
@ -20,7 +20,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libcurl.so:ftp/curl \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
-		libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 \
+		libjavascriptcoregtk-4.0.so:www/webkit2-gtk@40 \
 		libpng16.so:graphics/png \
 		libsoup-2.4.so:devel/libsoup \
 		libsysinfo.so:devel/libsysinfo
@ -56,7 +56,7 @@ DEMOS_CMAKE_BOOL=	JUCE_BUILD_EXAMPLES
 DEMOS_LDFLAGS=		-lexecinfo
 DEMOS_USE=		GNOME=atk,cairo,gdkpixbuf2,gtk30,pango
 DEMOS_LIB_DEPENDS=	libcurl.so:ftp/curl \
-			libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+			libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 			libsoup-2.4.so:devel/libsoup
 DEMO_FILES=	\
 	AnalyticsCollectionDemo AnimationAppDemo AnimationDemo AudioAppDemo AudioLatencyDemo AudioPlaybackDemo AudioPluginDemo AudioRecordingDemo AudioSettingsDemo AudioSynthesiserDemo \
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@ -220,7 +220,7 @@ XPM_USE=			XORG=xpm
 XPM_CONFIGURE_WITH=		xpm
 XWIDGETS_IMPLIES=		GTK3
 XWIDGETS_LIB_DEPENDS=		libsoup-2.4.so:devel/libsoup \
-				libwebkit2gtk-4.0.so:www/webkit2-gtk3
+				libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 XWIDGETS_USE=			XORG=xcomposite
 XWIDGETS_CONFIGURE_WITH=	xwidgets
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@ -247,7 +247,7 @@ XPM_USE=			XORG=xpm
 XPM_CONFIGURE_WITH=		xpm
 XWIDGETS_IMPLIES=		GTK3
 XWIDGETS_LIB_DEPENDS=		libsoup-2.4.so:devel/libsoup \
-				libwebkit2gtk-4.0.so:www/webkit2-gtk3
+				libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 XWIDGETS_USE=			XORG=xcomposite
 XWIDGETS_CONFIGURE_WITH=	xwidgets
--- a/editors/marker/Makefile
+++ b/editors/marker/Makefile
@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libgtkspell3-3.so:textproc/gtkspell3 \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	pandoc:textproc/hs-pandoc
 USES=		desktop-file-utils gettext-tools gnome meson pkgconfig
--- a/editors/quilter/Makefile
+++ b/editors/quilter/Makefile
@ -13,7 +13,7 @@ BUILD_DEPENDS=	discount>0:textproc/discount
 LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
 		libgranite.so:x11-toolkits/granite \
 		libgtkspell3-3.so:textproc/gtkspell3 \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libhandy-1.so:x11-toolkits/libhandy
 USES=		compiler:c11 desktop-file-utils gettext gnome meson pkgconfig python:build vala:build
--- a/editors/setzer/Makefile
+++ b/editors/setzer/Makefile
@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libgspell-1.so:textproc/gspell \
 		libpoppler-glib.so:graphics/poppler-glib \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdfminer.six>=0:textproc/py-pdfminer.six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libicudata.so:devel/icu \
 		libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	p5-Finance-Quote>=0:finance/p5-Finance-Quote \
 		p5-JSON-Parse>=0:devel/p5-JSON-Parse \
 		p5-libwww>=0:www/p5-libwww \
--- a/graphics/atril/Makefile
+++ b/graphics/atril/Makefile
@ -80,7 +80,7 @@ XPS_LIB_DEPENDS=	libgxps.so:graphics/libgxps
 EPUB_DESC=		Epub support
 EPUB_CONFIGURE_ENABLE=	epub
-EPUB_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+EPUB_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 DVI_DESC=		DVI viewer support
 DVI_USES=		tex
--- a/graphics/birdfont/Makefile
+++ b/graphics/birdfont/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libnotify.so:devel/libnotify \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libxmlbird.so:textproc/libxmlbird
 USES=		gettext-tools gnome pkgconfig python:build shared-mime-info \
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@ -100,7 +100,7 @@ WEBP_MESON_TRUE=	libwebp
 WEBSERVICES_DESC=	Web services
 WEBSERVICES_LIB_DEPENDS=\
 			libjson-glib-1.0.so:devel/json-glib \
-			libwebkit2gtk-4.0.so:www/webkit2-gtk3
+			libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 WEBSERVICES_MESON_TRUE=	webservices
 YELP_DESC=		Viewer for built-in help system
 YELP_RUN_DEPENDS=	yelp:x11/yelp
--- a/graphics/pdfpc/Makefile
+++ b/graphics/pdfpc/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libqrencode.so:graphics/libqrencode \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		cmake compiler:c11 gnome gstreamer pkgconfig vala:build xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@ -19,7 +19,7 @@ BUILD_DEPENDS=	git:devel/git \
 		zip:archivers/zip
 LIB_DEPENDS=	libsecret-1.so:security/libsecret \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		compiler:c++17-lang gl gmake java pkgconfig gnome
 # The github repositories.  The repository under NorbertXYZ is for a predefined maven
--- a/mail/astroid/Makefile
+++ b/mail/astroid/Makefile
@ -18,7 +18,7 @@ BROKEN=		fails to build with boost-1.85+
 BUILD_DEPENDS=	scdoc:textproc/scdoc \
 		notmuch>0:mail/notmuch
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 \
+		libjavascriptcoregtk-4.0.so:www/webkit2-gtk@40 \
 		libgmime-3.0.so:mail/gmime30 \
 		libgnutls.so:security/gnutls \
 		libpcre2-8.so:devel/pcre2 \
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libgmime-3.0.so:mail/gmime30 \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libical.so:devel/libical \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libgnutls.so:security/gnutls \
 		libfribidi.so:converters/fribidi \
 		libsoup-2.4.so:devel/libsoup  \
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@ -11,7 +11,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl
 IGNORE=		depends on www/webkit-gtk2, which has been removed
 .endif
 .if ${MASTER_OPTIONS:MGTK3}
-LIB_DEPENDS+=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+LIB_DEPENDS+=	libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 .endif
 CLAWS_PLUGINS_BUILD=	${PORTNAME}
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@ -20,7 +20,7 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libsecret-1.so:security/libsecret \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libical.so:devel/libical \
 		libjson-glib-1.0.so:devel/json-glib
 RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@ -36,7 +36,7 @@ LIB_DEPENDS=	libcryptui.so:security/libcryptui \
 		libp11-kit.so:security/p11-kit \
 		libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	highlight:textproc/highlight \
 		iso-codes>=0:misc/iso-codes
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@ -36,7 +36,7 @@ LIB_DEPENDS=	libappstream-glib.so:devel/appstream-glib \
 		libsoup-2.4.so:devel/libsoup \
 		libstemmer.so:textproc/snowballstemmer \
 		libunwind.so:devel/libunwind \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libytnef.so:converters/ytnef
 USES=		compiler:c11 cpe desktop-file-utils gettext gnome meson pkgconfig \
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@ -26,7 +26,7 @@ OPTIONS_SUB=		yes
 WEBKIT_DESC=		Use WebKitGTK for display of the user manual
 WEBKIT_LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
-			libwebkit2gtk-4.0.so:www/webkit2-gtk3
+			libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 WEBKIT_CONFIGURE_ON=	--with-webkitgtk=4.0
 post-patch-NLS-off:
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@ -26,7 +26,7 @@ LIB_DEPENDS=	libbiblesync.so:misc/biblesync \
 		libsoup-2.4.so:devel/libsoup \
 		libsword.so:misc/sword \
 		libuuid.so:misc/e2fsprogs-libuuid \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 # gettext is always needed, even if NLS is off
 USES=		cmake compiler:c11 gettext gnome minizip pkgconfig
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@ -15,7 +15,7 @@ LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@ -14,7 +14,7 @@ BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libfribidi.so:converters/fribidi \
 		libharfbuzz.so:print/harfbuzz \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libpeas-1.0.so:devel/libpeas \
 		libjson-glib-1.0.so:devel/json-glib
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@ -117,7 +117,7 @@ VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VNC_CMAKE_BOOL=		WITH_LIBVNCSERVER
 WWW_LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
-			libwebkit2gtk-4.0.so:www/webkit2-gtk3
+			libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 WWW_CMAKE_BOOL=		WITH_WEBKIT2GTK
 WWW_CMAKE_ON=		-DLIBSOUP_LIBRARY=${LOCALBASE}/lib/libsoup-2.4.so
--- a/print/xreader/Makefile
+++ b/print/xreader/Makefile
@ -49,7 +49,7 @@ DVI_USE=		TEX=kpathsea
 DVI_MESON_ON=		-Ddvi=true
 EPUB_BUILD_DEPENDS=	${MATHJAX_DIR}/MathJax.js:www/mathjax
-EPUB_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+EPUB_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 EPUB_RUN_DEPENDS=	${EPUB_BUILD_DEPENDS}
 EPUB_MESON_ON=		-Dmathjax-directory=${MATHJAX_DIR}
 EPUB_MESON_OFF=		-Depub=false
--- a/textproc/libgepub/Makefile
+++ b/textproc/libgepub/Makefile
@ -10,7 +10,7 @@ COMMENT=	GObject based library for handling and rendering epub documents
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libsoup-2.4.so:devel/libsoup
 USES=		compiler:c11 gettext-runtime gnome libarchive meson pkgconfig \
--- a/www/Makefile
+++ b/www/Makefile
@ -2569,8 +2569,7 @@
    SUBDIR += webgrind
    SUBDIR += webhook
    SUBDIR += webinject
-    SUBDIR += webkit2-gtk3
+    SUBDIR += webkit2-gtk
    SUBDIR += webkit2-gtk4
    SUBDIR += weblint++
    SUBDIR += webpy
    SUBDIR += webresolve
--- a/www/badwolf/Makefile
+++ b/www/badwolf/Makefile
@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS+=	libharfbuzz.so:print/harfbuzz \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		desktop-file-utils gnome ninja pkgconfig
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 libxml2 pango
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop \
 		libharfbuzz.so:print/harfbuzz \
 		libsoup-2.4.so:devel/libsoup \
 		libSystem.so:devel/deforaos-libsystem \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		desktop-file-utils gnome pkgconfig xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30
--- a/www/eolie/Makefile
+++ b/www/eolie/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv3+
 BUILD_DEPENDS=	appstream-util:devel/appstream-glib
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${LOCALBASE}/share/gir-1.0/GtkSpell-3.0.gir:textproc/gtkspell3 \
-		${LOCALBASE}/share/gir-1.0/WebKit2-4.0.gir:www/webkit2-gtk3 \
+		${LOCALBASE}/share/gir-1.0/WebKit2-4.0.gir:www/webkit2-gtk@40 \
 		${LOCALBASE}/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml:sysutils/gnome-settings-daemon
 USES=		desktop-file-utils gettext gnome meson pkgconfig python \
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@ -26,9 +26,9 @@ LIB_DEPENDS=	libdazzle-1.0.so:x11-toolkits/libdazzle \
 		libnss3.so:security/nss \
 		libp11-kit.so:security/p11-kit \
 		libsecret-1.so:security/libsecret \
-		libsoup-2.4.so:devel/libsoup \
+		libsoup-3.0.so:devel/libsoup3 \
 		libstartup-notification-1.so:x11/startup-notification \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.1.so:www/webkit2-gtk@41
 RUN_DEPENDS=	gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \
 		gnome-icon-theme>=0:misc/gnome-icon-theme \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
--- a/www/luakit-devel/Makefile
+++ b/www/luakit-devel/Makefile
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.GPLv3
 BUILD_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem@${LUA_FLAVOR}
 USES=		compiler:c++11-lang desktop-file-utils gmake \
--- a/www/luakit/Makefile
+++ b/www/luakit/Makefile
@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.GPLv3
 BUILD_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem@${LUA_FLAVOR}
 USES=		compiler:c++11-lang desktop-file-utils gettext-runtime gmake \
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@ -16,7 +16,7 @@ LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libp11-kit.so:security/p11-kit \
 		libgcr-base-3.so:security/gcr3 \
 		libpeas-1.0.so:devel/libpeas \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
--- a/www/py-pywebview-gtk/Makefile
+++ b/www/py-pywebview-gtk/Makefile
@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bottle>=0:www/py-bottle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}proxy_tools>=0:www/py-proxy_tools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
--- a/www/py-pywry/Makefile
+++ b/www/py-pywry/Makefile
@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		cargo gnome python
 USE_PYTHON=	pep517 autoplist
--- a/www/surf/Makefile
+++ b/www/surf/Makefile
@ -12,7 +12,7 @@ WWW=		https://surf.suckless.org
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libsoup-2.4.so:devel/libsoup \
 		libgcr-base-3.so:security/gcr3
 RUN_DEPENDS=	dmenu:x11/dmenu \
--- a/www/vimb/Makefile
+++ b/www/vimb/Makefile
@ -11,7 +11,7 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 USES=		compiler:c11 desktop-file-utils gmake gnome pkgconfig
 USE_GITHUB=	yes
--- a/www/webkit2-gtk/Makefile
+++ b/www/webkit2-gtk/Makefile
@ -0,0 +1,141 @@
 PORTNAME=	webkit
 DISTVERSION=	2.46.5
 CATEGORIES=	www
 MASTER_SITES=	https://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk_${FLAVOR}
 DISTNAME=	${PORTNAME}gtk-${DISTVERSION}
 DIST_SUBDIR=	gnome
 PATCH_SITES=	https://github.com/WebKit/WebKit/commit/
 PATCHFILES=	aa29001ade54425699e1345ce41bbd227dba805c.patch:-p1
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Opensource browser engine using the GTK 3 toolkit
 WWW=		https://webkitgtk.org/
 LICENSE=	GPLv2 BSD2CLAUSE
 LICENSE_COMB=	dual
 BROKEN_riscv64=	error: Unknown Architecture
 LIB_DEPENDS=	libavif.so:graphics/libavif \
 		libdrm.so:graphics/libdrm \
 		libenchant-2.so:textproc/enchant2 \
 		libepoxy.so:graphics/libepoxy \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgcrypt.so:security/libgcrypt \
 		libgraphene-1.0.so:graphics/graphene \
 		libgpg-error.so:security/libgpg-error \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libharfbuzz.so:print/harfbuzz \
 		libhyphen.so:textproc/hyphen \
 		libicudata.so:devel/icu \
 		libjxl.so:graphics/libjxl \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libsecret-1.so:security/libsecret \
 		libsysinfo.so:devel/libsysinfo \
 		libtasn1.so:security/libtasn1 \
 		libwebp.so:graphics/webp \
 		libwoff2dec.so:devel/woff2
 PORTSCOUT=	limitw:1,even
 FLAVORS=	60 41 40
 FLAVOR?=	${FLAVORS:[1]}
 USES=		bison cmake compiler:c++23-lang cpe gettext gl gnome gperf \
 		jpeg localbase:ldflags perl5 pkgconfig python:build \
 		ruby:build sqlite tar:xz xorg
 USE_GNOME=	cairo gdkpixbuf2 introspection:build libxml2 libxslt
 USE_GL=		egl gbm gl glesv2
 USE_LDCONFIG=	yes
 USE_GCC=	yes
 USE_PERL5=	build
 USE_XORG=	ice x11 xcomposite xdamage xext xrender xt
 CPE_VENDOR=	webkitgtk
 CPE_PRODUCT=	webkitgtk
 BINARY_ALIAS=		python=${PYTHON_CMD}
 CXXFLAGS+=		-DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32 \
 			-I${LOCALBASE}/include -lsysinfo
 CMAKE_ARGS=		-DPORT=GTK
 CMAKE_OFF=		${CMAKE_OFF_${ARCH}:U} \
 			ENABLE_GAMEPAD \
 			ENABLE_JOURNALD_LOG \
 			USE_LIBBACKTRACE \
 			USE_SYSTEM_MALLOC \
 			USE_SYSPROF_CAPTURE \
 			USE_SYSTEM_SYSPROF_CAPTURE
 CMAKE_OFF_armv6=	ENABLE_JIT
 CMAKE_OFF_armv7=	ENABLE_JIT
 INSTALL_TARGET=		install
 .if ${FLAVOR:M60}
 USE_GNOME+=	gtk40
 PLIST=	${.CURDIR}/pkg-plist_${FLAVOR}
 API_VERSION=	6.0
 WEBKIT_LIBRARY_VERSION=	4 10 7
 JAVASCRIPTCORE_LIBRARY_VERSION=	1 3 14
 .else
 USE_GNOME+=	gtk30
 CMAKE_OFF+=	USE_GTK4
 .endif
 .if ${FLAVOR:M40}
 LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 CMAKE_ON+=	USE_SOUP2
 API_VERSION=	4.0
 WEBKIT_LIBRARY_VERSION=	37 71 7
 JAVASCRIPTCORE_LIBRARY_VERSION=	18 25 14
 .else
 LIB_DEPENDS+=	libsoup-3.0.so:devel/libsoup3
 .endif
 .if ${FLAVOR:M41}
 API_VERSION=	4.1
 WEBKIT_LIBRARY_VERSION=	0 16 7
 JAVASCRIPTCORE_LIBRARY_VERSION=	0 6 14
 .endif
 PLIST_SUB=	API_VERSION=${API_VERSION} \
 		WEBKIT_LIBRARY_VERSION=${WEBKIT_LIBRARY_VERSION:ts.} \
 		WEBKIT_LIBRARY_VERSION_MAJOR=${WEBKIT_LIBRARY_VERSION:[1]} \
 		JAVASCRIPTCORE_LIBRARY_VERSION=${JAVASCRIPTCORE_LIBRARY_VERSION:ts.} \
 		JAVASCRIPTCORE_LIBRARY_VERSION_MAJOR=${JAVASCRIPTCORE_LIBRARY_VERSION:[1]}
 OPTIONS_DEFINE=		DOCS GEOIP GSTREAMER WAYLAND
 OPTIONS_DEFAULT=	GEOIP GSTREAMER WAYLAND
 OPTIONS_SUB=		yes
 DOCS_CMAKE_BOOL=	ENABLE_DOCUMENTATION
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gi-docgen>0:textproc/py-gi-docgen@${PY_FLAVOR}
 GEOIP_CMAKE_BOOL=	ENABLE_GEOLOCATION
 GEOIP_BUILD_DEPENDS=	geoclue>=2.4.3:net/geoclue
 GEOIP_RUN_DEPENDS=	geoclue>=2.4.3:net/geoclue
 GSTREAMER_USES=		gstreamer
 GSTREAMER_USE=		GSTREAMER=bad,gl
 GSTREAMER_CMAKE_BOOL=	ENABLE_VIDEO ENABLE_WEB_AUDIO
 WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.12:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
 			libwpe-1.0.so:www/libwpe \
 			libWPEBackend-fdo-1.0.so:www/wpebackend-fdo
 .include <bsd.port.options.mk>
 .ifdef WITH_DEBUG
 DEBUG_FLAGS=	-g1 # resulting package otherwise is huge
 .endif
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver \
 		${STAGEDIR}${PREFIX}/bin/WebKitWebDriver-${API_VERSION}
 .include <bsd.port.mk>
--- a/www/webkit2-gtk/distinfo
+++ b/www/webkit2-gtk/distinfo
@ -0,0 +1,5 @@
 TIMESTAMP = 1737410953
 SHA256 (gnome/webkitgtk-2.46.5.tar.xz) = bad4020bb0cfb3e740df3082c2d9cbf67cf4095596588a56aecdde6702137805
 SIZE (gnome/webkitgtk-2.46.5.tar.xz) = 42898600
 SHA256 (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 9b3e89e1a903f8763c3f4149d24e4ab02938b7ff72b6b24e870af0c7efe2d9c4
 SIZE (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 1301
--- a/www/webkit2-gtk/files/patch-Source_ThirdParty_ANGLE_src_common_SimpleMutex.h
+++ b/www/webkit2-gtk/files/patch-Source_ThirdParty_ANGLE_src_common_SimpleMutex.h
@ -0,0 +1,12 @@
 --- Source/ThirdParty/ANGLE/src/common/SimpleMutex.h.orig	2024-08-19 06:28:35 UTC
 +++ Source/ThirdParty/ANGLE/src/common/SimpleMutex.h
@@ -42,6 +42,9 @@
 // Assume support.
 #        define ANGLE_USE_FUTEX 1
 #    endif  // defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_ANDROID)
 +#    if defined(ANGLE_PLATFORM_FREEBSD) || defined(ANGLE_PLATFORM_OPENBSD)
 +#        define ANGLE_USE_FUTEX 0
 +#    endif
 #endif      // !defined(ANGLE_WITH_TSAN)
 namespace angle
--- a/www/webkit2-gtk/files/patch-Source_ThirdParty_ANGLE_src_common_platform.h
+++ b/www/webkit2-gtk/files/patch-Source_ThirdParty_ANGLE_src_common_platform.h
@ -0,0 +1,23 @@
 --- Source/ThirdParty/ANGLE/src/common/platform.h.orig	2024-08-19 06:28:35 UTC
 +++ Source/ThirdParty/ANGLE/src/common/platform.h
@@ -26,9 +26,17 @@
 #elif defined(__linux__) || defined(EMSCRIPTEN)
 #    define ANGLE_PLATFORM_LINUX 1
 #    define ANGLE_PLATFORM_POSIX 1
 -#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ||              \
 -    defined(__DragonFly__) || defined(__sun) || defined(__GLIBC__) || defined(__GNU__) || \
 -    defined(__QNX__) || defined(__Fuchsia__) || defined(__HAIKU__)
 +#elif defined(__FreeBSD__)
 +#    define ANGLE_PLATFORM_FREEBSD 1
 +#    define ANGLE_PLATFORM_POSIX 1
 +#    define ANGLE_PLATFORM_BSD 1
 +#elif defined(__OpenBSD__)
 +#    define ANGLE_PLATFORM_OPENBSD 1
 +#    define ANGLE_PLATFORM_POSIX 1
 +#    define ANGLE_PLATFORM_BSD 1
 +#elif defined(__NetBSD__) || defined(__DragonFly__) || defined(__sun) || \
 +    defined(__GLIBC__) || defined(__GNU__) || defined(__QNX__) || \
 +    defined(__Fuchsia__) || defined(__HAIKU__)
 #    define ANGLE_PLATFORM_POSIX 1
 #else
 #    error Unsupported platform.
--- a/www/webkit2-gtk/files/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
+++ b/www/webkit2-gtk/files/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
@ -0,0 +1,11 @@
 --- Source/WTF/wtf/glib/FileSystemGlib.cpp.orig	2024-08-19 06:28:38 UTC
 +++ Source/WTF/wtf/glib/FileSystemGlib.cpp
@@ -68,7 +68,7 @@ CString currentExecutablePath()
         return { };
     return CString({ readLinkBuffer, static_cast<size_t>(result) });
 }
 -#elif OS(HURD)
 +#elif OS(HURD) || OS(FREEBSD) || OS(OPENBSD)
 CString currentExecutablePath()
 {
     return { };
--- a/www/webkit2-gtk4/files/patch-Source_WebCore_platform_network_DNS.h
+++ b/www/webkit2-gtk4/files/patch-Source_WebCore_platform_network_DNS.h
@ -1,7 +1,7 @@
 Index: Source/WebCore/platform/network/DNS.h
--- Source/WebCore/platform/network/DNS.h.orig
+--- Source/WebCore/platform/network/DNS.h.orig	2023-09-19 08:27:49 UTC
 +++ Source/WebCore/platform/network/DNS.h
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@
 #include <ws2tcpip.h>
 #else
 #include <netinet/in.h>
--- a/www/webkit2-gtk/files/patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib.cpp
+++ b/www/webkit2-gtk/files/patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib.cpp
@ -0,0 +1,24 @@
 --- Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp.orig	2024-09-30 08:15:01 UTC
 +++ Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
@@ -160,7 +160,11 @@ void ProcessLauncher::launchProcess()
     }
     realExecutablePath = FileSystem::fileSystemRepresentation(executablePath);
 +#if OS(LINUX)
     unsigned nargs = 5; // size of the argv array for g_spawn_async()
 +#else
 +    unsigned nargs = 4; // size of the argv array for g_spawn_async()
 +#endif
 #if ENABLE(DEVELOPER_MODE)
     Vector<CString> prefixArgs;
@@ -187,7 +191,9 @@ void ProcessLauncher::launchProcess()
     argv[i++] = const_cast<char*>(realExecutablePath.data());
     argv[i++] = processIdentifier.get();
     argv[i++] = webkitSocket.get();
 +#if OS(LINUX)
     argv[i++] = pidSocketString.get();
 +#endif
 #if ENABLE(DEVELOPER_MODE)
     if (configureJSCForTesting)
         argv[i++] = const_cast<char*>("--configure-jsc-for-testing");
--- a/www/webkit2-gtk/files/patch-Source_WebKit_UIProcess_glib_WebProcessPoolGLib.cpp
+++ b/www/webkit2-gtk/files/patch-Source_WebKit_UIProcess_glib_WebProcessPoolGLib.cpp
@ -0,0 +1,11 @@
 --- Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp.orig	2024-08-29 11:52:43 UTC
 +++ Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
@@ -201,7 +201,7 @@ void WebProcessPool::setSandboxEnabled(bool enabled)
         return;
     }
 -#if !USE(SYSTEM_MALLOC)
 +#if !USE(SYSTEM_MALLOC) && OS(LINUX)
     if (RUNNING_ON_VALGRIND)
         return;
 #endif
--- a/www/webkit2-gtk/files/patch-Source_bmalloc_bmalloc_EligibilityResult.h
+++ b/www/webkit2-gtk/files/patch-Source_bmalloc_bmalloc_EligibilityResult.h
@ -0,0 +1,20 @@
 --- Source/bmalloc/bmalloc/EligibilityResult.h.orig	2024-08-19 06:28:40 UTC
 +++ Source/bmalloc/bmalloc/EligibilityResult.h
@@ -32,7 +32,7 @@ enum class EligibilityKind {
 namespace bmalloc {
 enum class EligibilityKind {
 -    Success,
 +    BmSuccess,
     Full,
     OutOfMemory
 };
@@ -44,7 +44,7 @@ struct EligibilityResult {
     EligibilityResult(EligibilityKind);
     EligibilityResult(IsoPage<Config>*);
 -    EligibilityKind kind { EligibilityKind::Success };
 +    EligibilityKind kind { EligibilityKind::BmSuccess };
     IsoPage<Config>* page { nullptr };
 };
--- a/www/webkit2-gtk/files/patch-Source_bmalloc_bmalloc_EligibilityResultInlines.h
+++ b/www/webkit2-gtk/files/patch-Source_bmalloc_bmalloc_EligibilityResultInlines.h
@ -0,0 +1,11 @@
 --- Source/bmalloc/bmalloc/EligibilityResultInlines.h.orig	2024-08-19 06:28:40 UTC
 +++ Source/bmalloc/bmalloc/EligibilityResultInlines.h
@@ -39,7 +39,7 @@ EligibilityResult<Config>::EligibilityResult(IsoPage<C
 template<typename Config>
 EligibilityResult<Config>::EligibilityResult(IsoPage<Config>* page)
 -    : kind(EligibilityKind::Success)
 +    : kind(EligibilityKind::BmSuccess)
     , page(page)
 {
 }
--- a/www/webkit2-gtk/files/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines.h
+++ b/www/webkit2-gtk/files/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines.h
@ -0,0 +1,11 @@
 --- Source/bmalloc/bmalloc/IsoAllocatorInlines.h.orig	2024-08-19 06:28:40 UTC
 +++ Source/bmalloc/bmalloc/IsoAllocatorInlines.h
@@ -76,7 +76,7 @@ BNO_INLINE void* IsoAllocator<Config>::allocateSlow(Is
     BASSERT(allocationMode == AllocationMode::Fast);
     EligibilityResult<Config> result = heap.takeFirstEligible(locker);
 -    if (result.kind != EligibilityKind::Success) {
 +    if (result.kind != EligibilityKind::BmSuccess) {
         RELEASE_BASSERT(result.kind == EligibilityKind::OutOfMemory);
         RELEASE_BASSERT(!abortOnFailure);
         return nullptr;
--- a/www/webkit2-gtk3/pkg-descr
+++ b/www/webkit2-gtk3/pkg-descr
--- a/www/webkit2-gtk/pkg-plist
+++ b/www/webkit2-gtk/pkg-plist
--- a/www/webkit2-gtk/pkg-plist_60
+++ b/www/webkit2-gtk/pkg-plist_60
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@ -1,111 +0,0 @@
 PORTNAME=	webkit
 DISTVERSION=	2.34.6
 PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	https://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
 DISTNAME=	${PORTNAME}gtk-${PORTVERSION}
 DIST_SUBDIR=	gnome
 PATCH_SITES=	https://github.com/WebKit/WebKit/commit/
 # https://bugs.webkit.org/show_bug.cgi?id=247770
 PATCHFILES=	06f9978e52a8408ed6c2c8296afb1e7449c2f1ee.patch:-p1 \
 		aa29001ade54425699e1345ce41bbd227dba805c.patch:-p1
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Opensource browser engine using the GTK 3 toolkit
 WWW=		https://webkitgtk.org/
 LICENSE=	GPLv2 BSD2CLAUSE
 LICENSE_COMB=	dual
 BUILD_DEPENDS=	${LOCALBASE}/bin/ar:devel/binutils
 LIB_DEPENDS=	libenchant-2.so:textproc/enchant2 \
 		libfribidi.so:converters/fribidi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libwebp.so:graphics/webp \
 		libpng.so:graphics/png \
 		libsecret-1.so:security/libsecret \
 		libnotify.so:devel/libnotify \
 		libhyphen.so:textproc/hyphen \
 		libicutu.so:devel/icu \
 		libopenjp2.so:graphics/openjpeg \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libsoup-2.4.so:devel/libsoup \
 		libgcrypt.so:security/libgcrypt \
 		libtasn1.so:security/libtasn1 \
 		libwoff2dec.so:devel/woff2
 PORTSCOUT=	limitw:1,even
 USES=		bison cmake compiler:c++14-lang cpe gettext gl gnome gperf \
 		jpeg localbase:ldflags perl5 pkgconfig python:build \
 		ruby:build sqlite tar:xz xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
 USE_GL=		gl egl glesv2
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_XORG=	x11 xcomposite xdamage xext xrender xt ice
 CPE_VENDOR=	webkitgtk
 CPE_PRODUCT=	webkitgtk
 BINARY_ALIAS=		python=${PYTHON_CMD}
 CXXFLAGS+=		-DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32
 CMAKE_ARGS=		-DPORT=GTK
 CMAKE_OFF=		USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
 			ENABLE_GLES2 \
 			USE_SYSTEMD \
 			ENABLE_GAMEPAD
 CMAKE_ON=		ENABLE_MINIBROWSER \
 			USE_SYSTEM_MALLOC \
 			USE_SOUP2
 CMAKE_OFF_armv6=	ENABLE_JIT
 CMAKE_OFF_armv7=	ENABLE_JIT
 INSTALL_TARGET=		install
 OPTIONS_DEFINE=		DEBUG GEOIP GSTREAMER WAYLAND
 OPTIONS_DEFAULT=	GEOIP GSTREAMER WAYLAND
 OPTIONS_SUB=		yes
 # Building WebKit with debugging symbols requires ar and ld with
 # support for thin archives.  Also see
 # https://bugs.webkit.org/show_bug.cgi?id=140384
 DEBUG_CMAKE_ON=		-DCMAKE_AR=${LOCALBASE}/bin/ar \
 			-DCMAKE_RANLIB=${LOCALBASE}/bin/ranlib \
 			-DCMAKE_LINKER=${LOCALBASE}/bin/ld
 DEBUG_CXXFLAGS=		-B${LOCALBASE}/bin
 DEBUG_CMAKE_OFF=	-DCMAKE_AR=/usr/bin/ar \
 			-DCMAKE_RANLIB=/usr/bin/ranlib \
 			-DCMAKE_LINKER=/usr/bin/ld
 DEBUG_CXXFLAGS_OFF=	-B/usr/bin
 DEBUG_CFLAGS_OFF=	-DNDEBUG
 GEOIP_CMAKE_BOOL=	ENABLE_GEOLOCATION
 GEOIP_BUILD_DEPENDS=	geoclue>=2.4.3:net/geoclue
 GEOIP_RUN_DEPENDS=	geoclue>=2.4.3:net/geoclue
 GSTREAMER_USES=		gstreamer
 GSTREAMER_USE=		GSTREAMER=bad,gl
 GSTREAMER_CMAKE_BOOL=	ENABLE_VIDEO ENABLE_WEB_AUDIO
 WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.12:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
 			libwpe-1.0.so:www/libwpe \
 			libWPEBackend-fdo-1.0.so:www/wpebackend-fdo
 post-install:
 	@${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/jsc \
 		${STAGEDIR}${PREFIX}/bin/jsc-4
 	@${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/MiniBrowser \
 		${STAGEDIR}${PREFIX}/bin/MiniBrowser-4
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-4.0/injected-bundle/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver
 .include <bsd.port.mk>
--- a/www/webkit2-gtk3/distinfo
+++ b/www/webkit2-gtk3/distinfo
@ -1,7 +0,0 @@
 TIMESTAMP = 1737243972
 SHA256 (gnome/webkitgtk-2.34.6.tar.xz) = 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6
 SIZE (gnome/webkitgtk-2.34.6.tar.xz) = 24393340
 SHA256 (gnome/06f9978e52a8408ed6c2c8296afb1e7449c2f1ee.patch) = 780812ffdff6b970c0e270e4605ec15325840723e2733c475371e92a56d257da
 SIZE (gnome/06f9978e52a8408ed6c2c8296afb1e7449c2f1ee.patch) = 1661
 SHA256 (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 9b3e89e1a903f8763c3f4149d24e4ab02938b7ff72b6b24e870af0c7efe2d9c4
 SIZE (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 1301
--- a/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake
+++ b/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake
@ -1,11 +0,0 @@
 --- Source/cmake/OptionsCommon.cmake.orig	2021-09-22 23:05:58 UTC
 +++ Source/cmake/OptionsCommon.cmake
@@ -144,7 +144,7 @@ WEBKIT_CHECK_HAVE_FUNCTION(HAVE_VASPRINTF vasprintf)
 # Check for symbols
 WEBKIT_CHECK_HAVE_SYMBOL(HAVE_REGEX_H regexec regex.h)
 if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))
 -    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h)
 +	#WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h)
 endif ()
 WEBKIT_CHECK_HAVE_SYMBOL(HAVE_TIMINGSAFE_BCMP timingsafe_bcmp string.h)
 # Windows has signal.h but is missing symbols that are used in calls to signal.
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
@ -1,11 +0,0 @@
 --- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2021-09-22 23:05:58 UTC
 +++ Source/JavaScriptCore/assembler/ARM64Assembler.h
@@ -2950,6 +2950,8 @@ class ARM64Assembler { (public)
     {
 #if OS(DARWIN)
         sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
 +#elif OS(FREEBSD) || OS(NETBSD)
 +        __clear_cache(code, reinterpret_cast<char*>(code) + size);
 #elif OS(FUCHSIA)
         zx_cache_flush(code, size, ZX_CACHE_FLUSH_INSN);
 #elif OS(LINUX)
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h
@ -1,11 +0,0 @@
 --- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig	2021-09-22 23:05:58 UTC
 +++ Source/JavaScriptCore/assembler/ARMv7Assembler.h
@@ -2402,6 +2402,8 @@ class ARMv7Assembler { (public)
     {
 #if OS(DARWIN)
         sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
 +#elif OS(FREEBSD) || OS(NETBSD)
 +        __clear_cache(code, reinterpret_cast<char*>(code) + size);
 #elif OS(LINUX)
         size_t page = pageSize();
         uintptr_t current = reinterpret_cast<uintptr_t>(code);
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_AbstractMacroAssembler.h
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_AbstractMacroAssembler.h
@ -1,11 +0,0 @@
 --- Source/JavaScriptCore/assembler/AbstractMacroAssembler.h.orig	2021-10-21 08:52:07 UTC
 +++ Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
@@ -971,7 +971,7 @@ class AbstractMacroAssembler : public AbstractMacroAss
     template<PtrTag tag>
     static void repatchCompact(CodeLocationDataLabelCompact<tag> dataLabelCompact, int32_t value)
     {
 -        AssemblerType::repatchCompact(dataLabelCompact.template dataLocation(), value);
 +        AssemblerType::repatchCompact(dataLabelCompact.template dataLocation<>(), value);
     }
     template<PtrTag tag>
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
@ -1,11 +0,0 @@
 --- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig	2021-09-22 23:05:58 UTC
 +++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp
@@ -95,7 +95,7 @@ namespace JSC {
 using namespace WTF;
 -#if defined(FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB) && FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB > 0
 +#if defined(FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB) && FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB > 0 && !defined(__aarch64__)
 static constexpr size_t fixedExecutableMemoryPoolSize = FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB * MB;
 #elif CPU(ARM)
 static constexpr size_t fixedExecutableMemoryPoolSize = 16 * MB;
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp
@ -1,12 +0,0 @@
 --- Source/JavaScriptCore/jsc.cpp.orig	2021-09-22 23:05:58 UTC
 +++ Source/JavaScriptCore/jsc.cpp
@@ -100,6 +100,9 @@
 #else
 #include <unistd.h>
 #endif
 +#if PLATFORM(GTK)
 +#include <locale.h>
 +#endif
 #if PLATFORM(COCOA)
 #include <crt_externs.h>
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_llint_LLIntData.h
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_llint_LLIntData.h
@ -1,56 +0,0 @@
 --- Source/JavaScriptCore/llint/LLIntData.h.orig	2021-10-21 08:52:07 UTC
 +++ Source/JavaScriptCore/llint/LLIntData.h
@@ -217,7 +217,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(OpcodeID op
 #if COMPILER(MSVC)
     return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).executableAddress());
 #else
 -    return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template executableAddress());
 +    return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template executableAddress<>());
 #endif
 }
@@ -227,7 +227,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(Opcod
 #if COMPILER(MSVC)
     return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).executableAddress());
 #else
 -    return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template executableAddress());
 +    return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template executableAddress<>());
 #endif
 }
@@ -237,7 +237,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(Opcod
 #if COMPILER(MSVC)
     return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).executableAddress());
 #else
 -    return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template executableAddress());
 +    return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template executableAddress<>());
 #endif
 }
@@ -328,7 +328,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(WasmOpcodeI
 #if COMPILER(MSVC)
     return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).executableAddress());
 #else
 -    return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template executableAddress());
 +    return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template executableAddress<>());
 #endif
 }
@@ -338,7 +338,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(WasmO
 #if COMPILER(MSVC)
     return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).executableAddress());
 #else
 -    return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template executableAddress());
 +    return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template executableAddress<>());
 #endif
 }
@@ -348,7 +348,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(WasmO
 #if COMPILER(MSVC)
     return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).executableAddress());
 #else
 -    return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template executableAddress());
 +    return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template executableAddress<>());
 #endif
 }
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb
@ -1,11 +0,0 @@
 --- Source/JavaScriptCore/offlineasm/arm64.rb.orig	2021-09-22 23:05:58 UTC
 +++ Source/JavaScriptCore/offlineasm/arm64.rb
@@ -1127,7 +1127,7 @@ class Instruction
             $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]"
             # On Linux, use ELF GOT relocation specifiers.
 -            $asm.putStr("#elif OS(LINUX)")
 +            $asm.putStr("#elif OS(LINUX) || OS(FREEBSD)")
             $asm.puts "adrp #{operands[1].arm64Operand(:quad)}, :got:#{operands[0].asmLabel}"
             $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, :got_lo12:#{operands[0].asmLabel}]"
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_config.rb
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_config.rb
@ -1,16 +0,0 @@
 --- Source/JavaScriptCore/offlineasm/config.rb.orig	2021-05-17 13:22:35 UTC
 +++ Source/JavaScriptCore/offlineasm/config.rb
@@ -22,11 +22,11 @@ buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR'];
 # THE POSSIBILITY OF SUCH DAMAGE.
 buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR'];
 -if buildProductsDirectory and File.exists?(buildProductsDirectory)
 +if buildProductsDirectory and File.exist?(buildProductsDirectory)
     $: << "#{buildProductsDirectory}/usr/local/include/WebKitAdditions/Scripts"
 end
 sdkRootDirectory = ENV['SDKROOT'];
 -if sdkRootDirectory and File.exists?(sdkRootDirectory)
 +if sdkRootDirectory and File.exist?(sdkRootDirectory)
     $: << "#{sdkRootDirectory}/usr/local/include/WebKitAdditions/Scripts"
 end
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_parser.rb
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_parser.rb
@ -1,28 +0,0 @@
 --- Source/JavaScriptCore/offlineasm/parser.rb.orig	2021-10-21 08:52:07 UTC
 +++ Source/JavaScriptCore/offlineasm/parser.rb
@@ -832,10 +832,10 @@ class Parser
                 @idx += 1
                 additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/"
                 fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName
 -                if not File.exists?(fileName)
 +                if not File.exist?(fileName)
                     fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName
                 end
 -                fileExists = File.exists?(fileName)
 +                fileExists = File.exist?(fileName)
                 raise "File not found: #{fileName}" if not fileExists and not isOptional
                 list << parse(fileName) if fileExists
             else
@@ -864,10 +864,10 @@ class Parser
                 @idx += 1
                 additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/"
                 fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName
 -                if not File.exists?(fileName)
 +                if not File.exist?(fileName)
                     fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName
                 end
 -                fileExists = File.exists?(fileName)
 +                fileExists = File.exist?(fileName)
                 raise "File not found: #{fileName}" if not fileExists and not isOptional
                 fileList << fileName if fileExists
             else
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_JSCast.h
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_JSCast.h
@ -1,20 +0,0 @@
 --- Source/JavaScriptCore/runtime/JSCast.h.orig	2021-10-21 08:52:07 UTC
 +++ Source/JavaScriptCore/runtime/JSCast.h
@@ -171,7 +171,7 @@ bool inherits(VM& vm, From* from)
 bool inherits(VM& vm, From* from)
 {
     using Dispatcher = InheritsTraits<Target>;
 -    return Dispatcher::template inherits(vm, from);
 +    return Dispatcher::template inherits<>(vm, from);
 }
 } // namespace JSCastingHelpers
@@ -180,7 +180,7 @@ To jsDynamicCast(VM& vm, From* from)
 To jsDynamicCast(VM& vm, From* from)
 {
     using Dispatcher = JSCastingHelpers::InheritsTraits<typename std::remove_cv<typename std::remove_pointer<To>::type>::type>;
 -    if (LIKELY(Dispatcher::template inherits(vm, from)))
 +    if (LIKELY(Dispatcher::template inherits<>(vm, from)))
         return static_cast<To>(from);
     return nullptr;
 }
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp
+++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp
@ -1,10 +0,0 @@
 --- Source/JavaScriptCore/runtime/NativeExecutable.cpp.orig	2021-09-22 23:05:58 UTC
 +++ Source/JavaScriptCore/runtime/NativeExecutable.cpp
@@ -24,6 +24,7 @@
  */
 #include "config.h"
 +#include "ExecutableBaseInlines.h"
 #include "NativeExecutable.h"
 #include "ExecutableBaseInlines.h"
--- a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_PlatformCPU.h
+++ b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_PlatformCPU.h
@ -1,18 +0,0 @@
 --- Source/WTF/wtf/PlatformCPU.h.orig	2020-08-12 09:17:54 UTC
 +++ Source/WTF/wtf/PlatformCPU.h
@@ -155,6 +155,7 @@
 #elif defined(__ARM_ARCH_6__) \
     || defined(__ARM_ARCH_6J__) \
     || defined(__ARM_ARCH_6K__) \
 +    || defined(__ARM_ARCH_6KZ__) \
     || defined(__ARM_ARCH_6Z__) \
     || defined(__ARM_ARCH_6ZK__) \
     || defined(__ARM_ARCH_6T2__) \
@@ -196,6 +197,7 @@
 #elif defined(__ARM_ARCH_6J__) \
     || defined(__ARM_ARCH_6K__) \
 +    || defined(__ARM_ARCH_6KZ__) \
     || defined(__ARM_ARCH_6Z__) \
     || defined(__ARM_ARCH_6ZK__) \
     || defined(__ARM_ARCH_6M__)
--- a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp
+++ b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp
@ -1,34 +0,0 @@
 --- Source/WTF/wtf/RAMSize.cpp.orig	2021-09-22 23:29:42 UTC
 +++ Source/WTF/wtf/RAMSize.cpp
@@ -35,6 +35,8 @@
 #include <sys/sysinfo.h>
 #elif OS(UNIX)
 #include <unistd.h>
 +#include <sys/types.h>
 +#include <sys/sysctl.h>
 #endif // OS(LINUX) || OS(UNIX)
 #else
 #include <bmalloc/bmalloc.h>
@@ -56,14 +58,18 @@ static size_t computeRAMSize()
         return ramSizeGuess;
     return status.ullTotalPhys;
 #elif USE(SYSTEM_MALLOC)
 -#if OS(LINUX) || OS(FREEBSD)
 +#if OS(LINUX)
     struct sysinfo si;
     sysinfo(&si);
     return si.totalram * si.mem_unit;
 #elif OS(UNIX)
 -    long pages = sysconf(_SC_PHYS_PAGES);
 -    long pageSize = sysconf(_SC_PAGE_SIZE);
 -    return pages * pageSize;
 +    size_t physmem, len;
 +    int mib[2] = { CTL_HW, HW_PHYSMEM };
 +    if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0
 +	&& len == sizeof(physmem))
 +	return physmem;
 +    else
 +	return 512 * MB; // guess
 #else
 #error "Missing a platform specific way of determining the available RAM"
 #endif // OS(LINUX) || OS(FREEBSD) || OS(UNIX)
--- a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp
+++ b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp
@ -1,11 +0,0 @@
 --- Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig	2021-09-22 23:05:58 UTC
 +++ Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp
@@ -28,7 +28,7 @@
 #include "config.h"
 #include <wtf/MemoryPressureHandler.h>
 -#include <malloc.h>
 +#include <stdlib.h>
 #include <unistd.h>
 #include <wtf/Logging.h>
 #include <wtf/MainThread.h>
--- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_PlatformScreen.h
+++ b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_PlatformScreen.h
@ -1,15 +0,0 @@
 --- Source/WebCore/platform/PlatformScreen.h.orig	2021-10-21 08:52:09 UTC
 +++ Source/WebCore/platform/PlatformScreen.h
@@ -48,6 +48,12 @@ OBJC_CLASS UIScreen;
 typedef struct CGColorSpace *CGColorSpaceRef;
 #endif
 +// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
 +// As a workaround, we explicitly undef them here.
 +#if defined(None)
 +#undef None
 +#endif
 +
 namespace WebCore {
 class DestinationColorSpace;
--- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
+++ b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
@ -1,20 +0,0 @@
 --- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig	2018-05-07 07:58:18 UTC
 +++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
@@ -35,7 +35,7 @@ namespace WebCore {
 //   ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D
 -static alignas(16) short s_FELightingConstantsForNeon[] = {
 +alignas(16) static short s_FELightingConstantsForNeon[] = {
     // Alpha coefficients.
     -2, 1, 0, -1, 2, 1, 0, -1,
     0, -1, -2, -1, 0, 1, 2, 1,
@@ -403,7 +403,7 @@ TOSTRING(neonDrawLighting) ":" NL
     "vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL
     "vmul.f32 " TMP3_Q ", " COLOR_Q ", " TMP2_D0 "[1]" NL
     "vcvt.u32.f32 " TMP3_Q ", " TMP3_Q NL
 -    "vmov.u32 r2, r3, " TMP3_S0 ", " TMP3_S1 NL
 +    "vmov r2, r3, " TMP3_S0 ", " TMP3_S1 NL
     // The color values are stored in-place.
     "strb r2, [" PIXELS_R ", #-11]" NL
     "strb r3, [" PIXELS_R ", #-10]" NL
--- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h
+++ b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h
@ -1,10 +0,0 @@
 --- Source/WebCore/platform/network/DNS.h.orig	2021-09-22 23:05:58 UTC
 +++ Source/WebCore/platform/network/DNS.h
@@ -33,6 +33,7 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #else
 +#include <sys/socket.h>
 #include <netinet/in.h>
 #endif
--- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp
+++ b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp
@ -1,11 +0,0 @@
 --- Source/WebCore/platform/text/TextCodec.cpp.orig	2019-02-16 10:10:59 UTC
 +++ Source/WebCore/platform/text/TextCodec.cpp
@@ -24,6 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 +#include <stdio.h>
 +
 #include "config.h"
 #include "TextCodec.h"
--- a/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake
+++ b/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake
@ -1,16 +0,0 @@
 --- Source/WebDriver/PlatformGTK.cmake.orig	2018-02-19 07:45:32 UTC
 +++ Source/WebDriver/PlatformGTK.cmake
@@ -5,6 +5,7 @@ add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIB
 list(APPEND WebDriver_SYSTEM_INCLUDE_DIRECTORIES
     "${GLIB_INCLUDE_DIRS}"
     "${LIBSOUP_INCLUDE_DIRS}"
 +    "${ICU_INCLUDE_DIRS}"
 )
 list(APPEND WebDriver_SOURCES
@@ -18,4 +19,5 @@ list(APPEND WebDriver_SOURCES
 list(APPEND WebDriver_LIBRARIES
     ${LIBSOUP_LIBRARIES}
 +    ${ICU_LIBRARIES}
 )
--- a/www/webkit2-gtk3/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb
+++ b/www/webkit2-gtk3/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb
@ -1,11 +0,0 @@
 --- Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb.orig	2021-05-17 13:22:42 UTC
 +++ Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb
@@ -36,7 +36,7 @@ class Task
       end
       generated_path = File.join tmpdir, output_filename
 -      if !File.exists?(generated_path)
 +      if !File.exist?(generated_path)
         puts "ERROR: Generated file does not exist at expected path."
         exit 1
       end
--- a/www/webkit2-gtk3/files/patch-Source_WebKit_webkitglib-symbols.map
+++ b/www/webkit2-gtk3/files/patch-Source_WebKit_webkitglib-symbols.map
@ -1,12 +0,0 @@
 --- Source/WebKit/webkitglib-symbols.map.orig	2021-05-17 13:22:43 UTC
 +++ Source/WebKit/webkitglib-symbols.map
@@ -3,9 +3,6 @@ global:
   jsc_*;
   webkit_*;
   extern "C++" {
 -    "bmalloc::PerThreadStorage<bmalloc::PerHeapKind<bmalloc::Cache> >::s_didInitialize";
 -    "bmalloc::PerThreadStorage<bmalloc::PerHeapKind<bmalloc::Cache> >::s_key";
 -    "bmalloc::vmPageSize()::cached";
     "WebKit::NetworkProcessMain(int, char**)";
     "WebKit::WebKitExtensionManager::initialize(WebKit::InjectedBundle*, API::Object*)";
     "WebKit::WebKitExtensionManager::singleton()";
--- a/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h
+++ b/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h
@ -1,10 +0,0 @@
 --- Source/bmalloc/bmalloc/BPlatform.h.orig	2021-09-22 23:05:58 UTC
 +++ Source/bmalloc/bmalloc/BPlatform.h
@@ -163,6 +163,7 @@
 #elif defined(__ARM_ARCH_6__) \
 || defined(__ARM_ARCH_6J__) \
 || defined(__ARM_ARCH_6K__) \
 +|| defined(__ARM_ARCH_6KZ__) \
 || defined(__ARM_ARCH_6Z__) \
 || defined(__ARM_ARCH_6ZK__) \
 || defined(__ARM_ARCH_6T2__) \
--- a/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake
+++ b/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake
@ -1,17 +0,0 @@
 --- Source/cmake/WebKitCommon.cmake.orig	2021-09-17 09:07:45 UTC
 +++ Source/cmake/WebKitCommon.cmake
@@ -106,11 +106,11 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
         endif ()
     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
         set(WTF_CPU_X86 1)
 -    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
 +    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
         set(WTF_CPU_PPC 1)
 -    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
 +    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
         set(WTF_CPU_PPC64 1)
 -    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
 +    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64le|powerpc64le)")
         set(WTF_CPU_PPC64LE 1)
     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
         set(WTF_CPU_RISCV64 1)
--- a/www/webkit2-gtk3/files/patch-revert-11ccaf183fad
+++ b/www/webkit2-gtk3/files/patch-revert-11ccaf183fad
@ -1,211 +0,0 @@
 Regressed by: https://github.com/WebKit/WebKit/commit/11ccaf183fad
 GStreamer.cpp.o -c /wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/p
 latform/graphics/gstreamer/MediaSampleGStreamer.cpp
 /wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/graphics/gs
 treamer/MediaSampleGStreamer.cpp:220:12: error: call to implicitly-deleted copy constructor o
 f 'WebCore::PlatformSample'
    return sample;
           ^~~~~~
 /wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample
 .h:57:7: note: copy constructor of 'PlatformSample' is implicitly deleted because field 'samp
 le' has a deleted copy constructor
    } sample;
      ^
 /wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample
 .h:56:66: note: copy constructor of '' is implicitly deleted because variant field 'byteRange
 Sample' has a non-trivial copy constructor
        std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample;
                                                                 ^
 1 error generated.
 diff --git Source/WTF/wtf/PlatformHave.h Source/WTF/wtf/PlatformHave.h
 index 4c5f1d2..e61e7fc 100644
 --- Source/WTF/wtf/PlatformHave.h
 +++ Source/WTF/wtf/PlatformHave.h
@@ -909,6 +909,12 @@
 #endif
 #endif
 +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110300
 +#if !defined(HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON)
 +#define HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON 1
 +#endif
 +#endif
 +
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110200) \
     || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140400)
 #define HAVE_AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS 1
 diff --git Source/WebCore/page/RuntimeEnabledFeatures.h Source/WebCore/page/RuntimeEnabledFeatures.h
 index c97386f..6bb9794 100644
 --- Source/WebCore/page/RuntimeEnabledFeatures.h
 +++ Source/WebCore/page/RuntimeEnabledFeatures.h
@@ -243,6 +243,11 @@ public:
     void setDisableMediaExperiencePIDInheritance(bool isDisabled) { m_disableMediaExperiencePIDInheritance = isDisabled; }
     bool disableMediaExperiencePIDInheritance() const { return m_disableMediaExperiencePIDInheritance; }
 #endif
 +    
 +#if HAVE(MT_PLUGIN_FORMAT_READER)
 +    void setWebMFormatReaderEnabled(bool isEnabled) { m_webMFormatReaderEnabled = isEnabled; }
 +    bool webMFormatReaderEnabled() const { return m_webMFormatReaderEnabled; }
 +#endif
 #if ENABLE(VORBIS)
     WEBCORE_EXPORT void setVorbisDecoderEnabled(bool isEnabled);
@@ -375,6 +380,10 @@ private:
     bool m_webMFormatReaderEnabled { false };
 #endif
 +#if HAVE(MT_PLUGIN_FORMAT_READER)
 +    bool m_webMFormatReaderEnabled { false };
 +#endif
 +
 #if ENABLE(MEDIA_SOURCE)
     bool m_webMParserEnabled { false };
     bool m_webMWebAudioEnabled { false };
 diff --git Source/WebCore/platform/MediaSample.h Source/WebCore/platform/MediaSample.h
 index 0847b97..d34ba7f 100644
 --- Source/WebCore/platform/MediaSample.h
 +++ Source/WebCore/platform/MediaSample.h
@@ -34,8 +34,6 @@
 typedef struct opaqueCMSampleBuffer *CMSampleBufferRef;
 typedef struct _GstSample GstSample;
 -typedef struct OpaqueMTPluginByteSource *MTPluginByteSourceRef;
 -typedef const struct opaqueCMFormatDescription *CMFormatDescriptionRef;
 namespace WebCore {
@@ -47,13 +45,11 @@ struct PlatformSample {
         MockSampleBoxType,
         CMSampleBufferType,
         GStreamerSampleType,
 -        ByteRangeSampleType,
     } type;
     union {
         MockSampleBox* mockSampleBox;
         CMSampleBufferRef cmSampleBuffer;
         GstSample* gstSample;
 -        std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample;
     } sample;
 };
@@ -91,12 +87,6 @@ public:
     virtual SampleFlags flags() const = 0;
     virtual PlatformSample platformSample() = 0;
 -    struct ByteRange {
 -        size_t byteOffset { 0 };
 -        size_t byteLength { 0 };
 -    };
 -    virtual std::optional<ByteRange> byteRange() const = 0;
 -
     enum class VideoRotation {
         None = 0,
         UpsideDown = 180,
 diff --git Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h
 index d7a49b9..874c3dc 100644
 --- Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h
 +++ Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h
@@ -57,7 +57,6 @@ public:
     Ref<MediaSample> createNonDisplayingCopy() const override;
     SampleFlags flags() const override { return m_flags; }
     PlatformSample platformSample() override;
 -    std::optional<ByteRange> byteRange() const override { return std::nullopt; }
     void dump(PrintStream&) const override;
     RefPtr<JSC::Uint8ClampedArray> getRGBAImageData() const final;
 diff --git Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
 index 5cb60b9..83da5b0 100644
 --- Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
 +++ Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
@@ -62,7 +62,6 @@ private:
     size_t sizeInBytes() const override { return sizeof(m_box); }
     SampleFlags flags() const override;
     PlatformSample platformSample() override;
 -    std::optional<ByteRange> byteRange() const override { return std::nullopt; }
     FloatSize presentationSize() const override { return FloatSize(); }
     void dump(PrintStream&) const override;
     void offsetTimestampsBy(const MediaTime& offset) override { m_box.offsetTimestampsBy(offset); }
 diff --git Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp
 index 496e42a..43664ed 100644
 --- Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp
 +++ Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp
@@ -23,14 +23,15 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 -#include <WebKit/WKMediaFormatReader.h>
 +#include "config.h"
 -extern "C" WK_EXPORT OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionaryRef, MTPluginFormatReaderRef*);
 +#if HAVE(MT_PLUGIN_FORMAT_READER)
 -OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef byteSource, CFAllocatorRef allocator, CFDictionaryRef, MTPluginFormatReaderRef* formatReader)
 +OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionary
 +Ref, MTPluginFormatReaderRef* formatReader)
 {
 -    OSStatus status = WKMediaFormatReaderCreate(allocator, formatReader);
 -    if (status != noErr)
 -        return status;
 -    return WKMediaFormatReaderStartOnMainThread(*formatReader, byteSource);
 +	*formatReader = nullptr;
 +	return kMTPluginFormatReaderError_InternalFailure;
 }
 +
 +#endif // HAVE(MT_PLUGIN_FORMAT_READER)
 diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.cpp Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
 index 8b24061..83e3a04 100644
 --- Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
 +++ Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
@@ -289,6 +289,19 @@ bool defaultWebMFormatReaderEnabled()
 #endif // ENABLE(WEBM_FORMAT_READER)
 +#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
 +
 +bool defaultWebMFormatReaderEnabled()
 +{
 +#if HAVE(SYSTEM_FEATURE_FLAGS)
 +    return isFeatureFlagEnabled("webm_format_reader");
 +#endif
 +
 +    return false;
 +}
 +
 +#endif
 +
 #if ENABLE(VP9)
 bool defaultVP8DecoderEnabled()
 diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.h Source/WebKit/Shared/WebPreferencesDefaultValues.h
 index c7af0cb..c1c91ed 100644
 --- Source/WebKit/Shared/WebPreferencesDefaultValues.h
 +++ Source/WebKit/Shared/WebPreferencesDefaultValues.h
@@ -95,6 +95,10 @@ bool defaultWebXREnabled();
 bool defaultWebMFormatReaderEnabled();
 #endif
 +#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
 +bool defaultWebMFormatReaderEnabled();
 +#endif
 +
 #if ENABLE(VP9)
 bool defaultVP8DecoderEnabled();
 bool defaultVP9DecoderEnabled();
 diff --git Source/WebKit/SourcesCocoa.txt Source/WebKit/SourcesCocoa.txt
 index 78fb424..ac04aa8 100644
 --- Source/WebKit/SourcesCocoa.txt
 +++ Source/WebKit/SourcesCocoa.txt
@@ -229,6 +229,11 @@ Shared/mac/MediaFormatReader/MediaSampleByteRange.cpp
 Shared/mac/MediaFormatReader/MediaSampleCursor.cpp
 Shared/mac/MediaFormatReader/MediaTrackReader.cpp
 +Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp
 +Shared/mac/MediaFormatReader/FormatReader.cpp
 +Shared/mac/MediaFormatReader/SampleCursor.cpp
 +Shared/mac/MediaFormatReader/TrackReader.cpp
 +
 Shared/Plugins/mac/PluginSandboxProfile.mm
 Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
--- a/www/webkit2-gtk3/pkg-plist
+++ b/www/webkit2-gtk3/pkg-plist
@ -1,287 +0,0 @@
 bin/MiniBrowser-4
 bin/WebKitWebDriver
 bin/jsc-4
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
 include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h
 include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h
 include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h
 include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
 include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
 include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
 include/webkitgtk-4.0/jsc/JSCAutocleanups.h
 include/webkitgtk-4.0/jsc/JSCClass.h
 include/webkitgtk-4.0/jsc/JSCContext.h
 include/webkitgtk-4.0/jsc/JSCDefines.h
 include/webkitgtk-4.0/jsc/JSCException.h
 include/webkitgtk-4.0/jsc/JSCOptions.h
 include/webkitgtk-4.0/jsc/JSCValue.h
 include/webkitgtk-4.0/jsc/JSCVersion.h
 include/webkitgtk-4.0/jsc/JSCVirtualMachine.h
 include/webkitgtk-4.0/jsc/JSCWeakValue.h
 include/webkitgtk-4.0/jsc/jsc.h
 include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h
 include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
 include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
 include/webkitgtk-4.0/webkit2/WebKitAutomationSession.h
 include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
 include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
 include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
 include/webkitgtk-4.0/webkit2/WebKitConsoleMessage.h
 include/webkitgtk-4.0/webkit2/WebKitContextMenu.h
 include/webkitgtk-4.0/webkit2/WebKitContextMenuActions.h
 include/webkitgtk-4.0/webkit2/WebKitContextMenuItem.h
 include/webkitgtk-4.0/webkit2/WebKitCookieManager.h
 include/webkitgtk-4.0/webkit2/WebKitCredential.h
 include/webkitgtk-4.0/webkit2/WebKitDefines.h
 include/webkitgtk-4.0/webkit2/WebKitDeviceInfoPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitDownload.h
 include/webkitgtk-4.0/webkit2/WebKitEditingCommands.h
 include/webkitgtk-4.0/webkit2/WebKitEditorState.h
 include/webkitgtk-4.0/webkit2/WebKitEnumTypes.h
 include/webkitgtk-4.0/webkit2/WebKitError.h
 include/webkitgtk-4.0/webkit2/WebKitFaviconDatabase.h
 include/webkitgtk-4.0/webkit2/WebKitFileChooserRequest.h
 include/webkitgtk-4.0/webkit2/WebKitFindController.h
 include/webkitgtk-4.0/webkit2/WebKitFormSubmissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitForwardDeclarations.h
 include/webkitgtk-4.0/webkit2/WebKitFrame.h
 include/webkitgtk-4.0/webkit2/WebKitGeolocationManager.h
 include/webkitgtk-4.0/webkit2/WebKitGeolocationPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h
 include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h
 include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h
 include/webkitgtk-4.0/webkit2/WebKitMediaKeySystemPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitMemoryPressureSettings.h
 include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h
 include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h
 include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h
 include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h
 include/webkitgtk-4.0/webkit2/WebKitNotification.h
 include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h
 include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h
 include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitPlugin.h
 include/webkitgtk-4.0/webkit2/WebKitPointerLockPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
 include/webkitgtk-4.0/webkit2/WebKitPrintCustomWidget.h
 include/webkitgtk-4.0/webkit2/WebKitPrintOperation.h
 include/webkitgtk-4.0/webkit2/WebKitResponsePolicyDecision.h
 include/webkitgtk-4.0/webkit2/WebKitScriptDialog.h
 include/webkitgtk-4.0/webkit2/WebKitScriptWorld.h
 include/webkitgtk-4.0/webkit2/WebKitSecurityManager.h
 include/webkitgtk-4.0/webkit2/WebKitSecurityOrigin.h
 include/webkitgtk-4.0/webkit2/WebKitSettings.h
 include/webkitgtk-4.0/webkit2/WebKitURIRequest.h
 include/webkitgtk-4.0/webkit2/WebKitURIResponse.h
 include/webkitgtk-4.0/webkit2/WebKitURISchemeRequest.h
 include/webkitgtk-4.0/webkit2/WebKitURIUtilities.h
 include/webkitgtk-4.0/webkit2/WebKitUserContent.h
 include/webkitgtk-4.0/webkit2/WebKitUserContentFilterStore.h
 include/webkitgtk-4.0/webkit2/WebKitUserContentManager.h
 include/webkitgtk-4.0/webkit2/WebKitUserMediaPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitUserMessage.h
 include/webkitgtk-4.0/webkit2/WebKitVersion.h
 include/webkitgtk-4.0/webkit2/WebKitWebContext.h
 include/webkitgtk-4.0/webkit2/WebKitWebEditor.h
 include/webkitgtk-4.0/webkit2/WebKitWebExtension.h
 include/webkitgtk-4.0/webkit2/WebKitWebExtensionAutocleanups.h
 include/webkitgtk-4.0/webkit2/WebKitWebHitTestResult.h
 include/webkitgtk-4.0/webkit2/WebKitWebInspector.h
 include/webkitgtk-4.0/webkit2/WebKitWebPage.h
 include/webkitgtk-4.0/webkit2/WebKitWebProcessEnumTypes.h
 include/webkitgtk-4.0/webkit2/WebKitWebResource.h
 include/webkitgtk-4.0/webkit2/WebKitWebView.h
 include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h
 include/webkitgtk-4.0/webkit2/WebKitWebViewSessionState.h
 include/webkitgtk-4.0/webkit2/WebKitWebsiteData.h
 include/webkitgtk-4.0/webkit2/WebKitWebsiteDataAccessPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitWebsiteDataManager.h
 include/webkitgtk-4.0/webkit2/WebKitWebsitePolicies.h
 include/webkitgtk-4.0/webkit2/WebKitWindowProperties.h
 include/webkitgtk-4.0/webkit2/webkit-web-extension.h
 include/webkitgtk-4.0/webkit2/webkit2.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMAttr.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMBlob.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCDATASection.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSRule.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSRuleList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleDeclaration.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleSheet.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSValue.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterData.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMClientRect.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMClientRectList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMComment.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCustom.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCustomUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMImplementation.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMSelection.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMTokenList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMWindow.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMWindowUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDeprecated.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocument.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentFragment.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentFragmentUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentType.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMEvent.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMEventTarget.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMFile.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMFileList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAnchorElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAppletElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAreaElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLBRElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLBaseElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLBodyElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLButtonElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLCanvasElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLCollection.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDListElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDirectoryElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDivElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDocument.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLEmbedElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFieldSetElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFontElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFormElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFrameElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFrameSetElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHRElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHeadElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHeadingElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHtmlElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLIFrameElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLImageElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLInputElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLIElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLabelElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLegendElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLinkElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMapElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMarqueeElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMenuElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMetaElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLModElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOListElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLObjectElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptGroupElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptionElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptionsCollection.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLParagraphElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLParamElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLPreElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLQuoteElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLScriptElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLSelectElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLStyleElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableCaptionElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableCellElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableColElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableRowElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableSectionElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTextAreaElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTitleElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLUListElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMKeyboardEvent.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMMediaList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEvent.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNamedNodeMap.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNode.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNodeFilter.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNodeIterator.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNodeList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMObject.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMProcessingInstruction.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMRange.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMRangeUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMStyleSheet.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMStyleSheetList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMText.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMTreeWalker.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMUIEvent.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
 include/webkitgtk-4.0/webkitdom/webkitdom.h
 include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h
 include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
 lib/girepository-1.0/JavaScriptCore-4.0.typelib
 lib/girepository-1.0/WebKit2-4.0.typelib
 lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
 lib/libjavascriptcoregtk-4.0.so.18.19.11
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
 lib/libwebkit2gtk-4.0.so.37.55.9
 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 libdata/pkgconfig/javascriptcoregtk-4.0.pc
 libdata/pkgconfig/webkit2gtk-4.0.pc
 libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
 libexec/webkit2gtk-4.0/MiniBrowser
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
 libexec/webkit2gtk-4.0/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
 share/gir-1.0/JavaScriptCore-4.0.gir
 share/gir-1.0/WebKit2-4.0.gir
 share/gir-1.0/WebKit2WebExtension-4.0.gir
 share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/ca/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/cs/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/da/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/de/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/el/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/en_CA/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/en_GB/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/eo/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/es/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/et/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/eu/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/fi/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/fr/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/gl/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/gu/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/he/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/hi/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/hu/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/id/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/it/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/ja/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/kn/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/ko/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/lt/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/lv/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/ml/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/mr/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/nb/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/nl/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/or/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/pa/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/pl/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/pt/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/pt_BR/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/ro/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/ru/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/sl/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/sr/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/sr@latin/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/sv/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/ta/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/te/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/tr/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/uk/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/vi/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/zh_CN/LC_MESSAGES/WebKit2GTK-4.0.mo
--- a/www/webkit2-gtk4/Makefile
+++ b/www/webkit2-gtk4/Makefile
@ -1,117 +0,0 @@
 PORTNAME=	webkit
 DISTVERSION=	2.38.3
 PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	https://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk4
 DISTNAME=	${PORTNAME}gtk-${PORTVERSION}
 DIST_SUBDIR=	gnome
 PATCH_SITES=	https://github.com/WebKit/WebKit/commit/
 PATCHFILES=	285ff73b5f6d46d6e502aca30061667e41a3114b.patch:-p1 \
 		aa29001ade54425699e1345ce41bbd227dba805c.patch:-p1
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Opensource browser engine using the GTK 4 toolkit
 WWW=		https://webkitgtk.org/
 LICENSE=	BSD2CLAUSE GPLv2
 LICENSE_COMB=	dual
 BROKEN_riscv64=	error: Unknown Architecture
 BUILD_DEPENDS=	${LOCALBASE}/bin/ar:devel/binutils \
 		${PYTHON_PKGNAMEPREFIX}gi-docgen>0:textproc/py-gi-docgen@${PY_FLAVOR}
 LIB_DEPENDS=	libenchant-2.so:textproc/enchant2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgcrypt.so:security/libgcrypt \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libharfbuzz.so:print/harfbuzz \
 		libhyphen.so:textproc/hyphen \
 		libicutu.so:devel/icu \
 		libnotify.so:devel/libnotify \
 		libopenjp2.so:graphics/openjpeg \
 		libpng.so:graphics/png \
 		libsecret-1.so:security/libsecret \
 		libsoup-3.0.so:devel/libsoup3 \
 		libtasn1.so:security/libtasn1 \
 		libwebp.so:graphics/webp \
 		libwoff2dec.so:devel/woff2
 PORTSCOUT=	limitw:1,even
 USES=		bison cmake compiler:c++20-lang cpe gettext gl gnome gperf jpeg \
 		localbase:ldflags perl5 pkgconfig python:build ruby:build \
 		sqlite tar:xz xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk40 libxml2 libxslt introspection:build
 USE_GL=		egl gl glesv2
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_XORG=	ice x11 xcomposite xdamage xext xrender xt
 CPE_VENDOR=	webkitgtk
 CPE_PRODUCT=	webkitgtk
 BINARY_ALIAS=		python=${PYTHON_CMD}
 CXXFLAGS+=		-DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32
 CMAKE_ARGS=		-DPORT=GTK
 CMAKE_OFF=		${CMAKE_OFF_${ARCH}:U} ENABLE_GAMEPAD ENABLE_GLES2 \
 			ENABLE_JOURNALD_LOG USE_LD_GOLD USE_SYSTEMD
 CMAKE_ON=		ENABLE_MINIBROWSER USE_GTK4 USE_SYSTEM_MALLOC
 CMAKE_OFF_armv6=	ENABLE_JIT
 CMAKE_OFF_armv7=	ENABLE_JIT
 INSTALL_TARGET=		install
 OPTIONS_DEFINE=		DEBUG GEOIP GSTREAMER WAYLAND
 OPTIONS_DEFAULT=	GEOIP GSTREAMER WAYLAND
 OPTIONS_SUB=		yes
 # Building WebKit with debugging symbols requires ar and ld with
 # support for thin archives.  Also see
 # https://bugs.webkit.org/show_bug.cgi?id=140384
 DEBUG_CMAKE_ON=	-DCMAKE_AR=${LOCALBASE}/bin/ar \
 		-DCMAKE_LINKER=${LOCALBASE}/bin/ld \
 		-DCMAKE_RANLIB=${LOCALBASE}/bin/ranlib
 DEBUG_CXXFLAGS=	-B${LOCALBASE}/bin
 DEBUG_CMAKE_OFF=	-DCMAKE_AR=/usr/bin/ar \
 			-DCMAKE_LINKER=/usr/bin/ld \
 			-DCMAKE_RANLIB=/usr/bin/ranlib
 DEBUG_CXXFLAGS_OFF=	-B/usr/bin
 DEBUG_CFLAGS_OFF=	-DNDEBUG
 GEOIP_CMAKE_BOOL=	ENABLE_GEOLOCATION
 GEOIP_BUILD_DEPENDS=	geoclue>=2.4.3:net/geoclue
 GEOIP_RUN_DEPENDS=	geoclue>=2.4.3:net/geoclue
 GSTREAMER_USES=		gstreamer
 GSTREAMER_USE=		GSTREAMER=bad,gl
 GSTREAMER_CMAKE_BOOL=	ENABLE_VIDEO ENABLE_WEB_AUDIO
 WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.12:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
 			libwpe-1.0.so:www/libwpe \
 			libWPEBackend-fdo-1.0.so:www/wpebackend-fdo
 .include <bsd.port.pre.mk>
 .if ${COMPILER_TYPE} == clang
 CXXFLAGS+=	-Wno-error=enum-constexpr-conversion
 .endif
 post-install:
 	@${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-5.0/jsc \
 		${STAGEDIR}${PREFIX}/bin/jsc-5
 	@${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-5.0/MiniBrowser \
 		${STAGEDIR}${PREFIX}/bin/MiniBrowser-5
 	@${MV} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver \
 		${STAGEDIR}${PREFIX}/bin/WebKitWebDriver-5
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-5.0/injected-bundle/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-5.0/*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver-5
 .include <bsd.port.post.mk>
--- a/www/webkit2-gtk4/distinfo
+++ b/www/webkit2-gtk4/distinfo
@ -1,7 +0,0 @@
 TIMESTAMP = 1737243993
 SHA256 (gnome/webkitgtk-2.38.3.tar.xz) = 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
 SIZE (gnome/webkitgtk-2.38.3.tar.xz) = 33003928
 SHA256 (gnome/285ff73b5f6d46d6e502aca30061667e41a3114b.patch) = 8a71eead30e23ba2cca5168ec930376f01e4b780dad7d3ba2cba7371540857e0
 SIZE (gnome/285ff73b5f6d46d6e502aca30061667e41a3114b.patch) = 885
 SHA256 (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 9b3e89e1a903f8763c3f4149d24e4ab02938b7ff72b6b24e870af0c7efe2d9c4
 SIZE (gnome/aa29001ade54425699e1345ce41bbd227dba805c.patch) = 1301
--- a/www/webkit2-gtk4/files/Source_WebCore_platform_graphics_gstreamer_MediaSampleGStreamer.h
+++ b/www/webkit2-gtk4/files/Source_WebCore_platform_graphics_gstreamer_MediaSampleGStreamer.h
@ -1,10 +0,0 @@
 --- work/webkitgtk-2.38.3/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h.orig	2023-02-01 19:14:20.412727000 -0800
 +++ work/webkitgtk-2.38.3/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h	2023-02-01 19:14:27.116674000 -0800
@@ -51,7 +51,6 @@
     void setTimestamps(const MediaTime&, const MediaTime&) override;
     Ref<MediaSample> createNonDisplayingCopy() const override;
     SampleFlags flags() const override { return m_flags; }
 -    PlatformSample platformSample() const override;
     PlatformSample::Type platformSampleType() { return PlatformSample::GStreamerSampleType; }
     void dump(PrintStream&) const override;
--- a/www/webkit2-gtk4/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
+++ b/www/webkit2-gtk4/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
@ -1,12 +0,0 @@
 Index: Source/JavaScriptCore/assembler/ARM64Assembler.h
 --- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig
 +++ Source/JavaScriptCore/assembler/ARM64Assembler.h
@@ -2918,6 +2918,8 @@ class ARM64Assembler { (public)
     {
 #if OS(DARWIN)
         sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
 +#elif OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD)
 +        __clear_cache(code, reinterpret_cast<char*>(code) + size);
 #elif OS(FUCHSIA)
         zx_cache_flush(code, size, ZX_CACHE_FLUSH_INSN);
 #elif OS(LINUX)
--- a/Show more
+++ b/Show more