diff --git a/devel/electron39/Makefile b/devel/electron39/Makefile
index 6557640b2843..b3f7782d4425 100644
--- a/devel/electron39/Makefile
+++ b/devel/electron39/Makefile
@@ -1,441 +1,443 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER}
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v39.3.0/:chromium \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.1:chromium \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.2:chromium \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
 WWW=		https://electronjs.org/
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL11 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
 BROKEN_i386=	fetch fails: node process stalls during fetch phase and eats up all CPUs
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 FETCH_DEPENDS=	git:devel/git \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 PATCH_DEPENDS=	git:devel/git \
 		jq:textproc/jq
 BUILD_DEPENDS=	gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 		rustc:lang/rust \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libdbus-1.so:devel/dbus \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libva.so:multimedia/libva \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 TEST_DEPENDS=	git:devel/git \
 		${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR}
 
 USES=		bison compiler:c++17-lang cpe display:test electron:env \
 		gettext-tools gl gmake gnome iconv:wchar_t jpeg \
 		localbase:ldflags ninja nodejs:22,build pkgconfig \
 		python:build,test qt:5 shebangfix tar:xz xorg
 
 CPE_VENDOR=	electronjs
 USE_GITHUB=	yes
 GH_TUPLE=	nodejs:node:v${NODE_VER}:node \
 		nodejs:nan:${NAN_VER}:nan \
 		Squirrel:Squirrel.Mac:${SQUIRREL_MAC_VER}:squirrel_mac \
 		ReactiveCocoa:ReactiveObjC:${REACTIVEOBJC_VER}:reactiveobjc \
 		Mantle:Mantle:${MANTLE_VER}:mantle \
 		EngFlow:reclient-configs:${ENGFLOW_RECLIENT_CONFIGS_VER}:reclient_configs
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo gdkpixbuf gtk30 libxml2 libxslt pango
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
 		xrender xscrnsaver xtst
 USE_QT=		buildtools:build core:build widgets:build
 USE_ELECTRON=	npm:yarn4 prefetch extract
 NPM_EXTRACT_WRKSRC=	${WRKSRC:H}/${PORTNAME}-${ELECTRON_VER}
 
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
 
 MAKE_ARGS=	-C out/${BUILDTYPE}
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 ALL_TARGET=	electron electron:node_headers
 POST_BUILD_TARGETS=	licenses version
 POST_BUILD_DIST_TARGETS=electron_dist_zip electron_chromedriver_zip \
 			electron_mksnapshot_zip
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 BUNDLE_LIBS=	yes
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_backup_ref_ptr_support=false \
 		enable_hangout_services_extension=true \
 		enable_remoting=false \
 		fatal_linker_warnings=false \
 		icu_use_data_file=false \
 		is_clang=true \
 		moc_qt5_path="${QT_TOOLDIR}/moc" \
 		optimize_webui=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=true \
 		use_custom_libunwind=true \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \
 		use_qt5=true \
 		use_sysroot=false \
 		use_system_freetype=false \
 		use_system_harfbuzz=true \
 		use_system_libffi=true \
 		use_system_libjpeg=true \
 		use_udev=false \
 		chrome_pgo_phase=0 \
 		extra_cflags="${CFLAGS}" \
 		extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}" \
 		override_electron_version="${ELECTRON_VER}"
 
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 OPTIONS_DEFINE=		CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO PIPEWIRE
 OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE ALSA PULSEAUDIO SNDIO
 OPTIONS_EXCLUDE_aarch64=LTO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
 OPTIONS_SUB=		yes
 CODECS_DESC=		Compile and enable patented codecs like H.264
 DIST_DESC=		Build distribution zip files
 DRIVER_DESC=		Install chromedriver
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
 PIPEWIRE_DESC=		Screen capture via PipeWire
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 			alsa-lib>=1.1.1_1:audio/alsa-lib
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
 CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
 			FFMPEG_BRAND="Chrome"
 CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
 			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 
 DEBUG_BUILD_DEPENDS=	esbuild:devel/esbuild
 DEBUG_MAKE_ENV=		ELECTRON_OUT_DIR=Debug
 DEBUG_MAKE_ENV_OFF=	ELECTRON_OUT_DIR=Release
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_FILE=testing.gn \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
 			WANTSPACE="21 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_FILE=release.gn \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
 			WANTSPACE="14 GB"
 
 DIST_IMPLIES=		DRIVER
 DRIVER_MAKE_ARGS=	chromedriver
 
 HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 LTO_VARS_OFF=		GN_ARGS+=use_thin_lto=false
 
 MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
 
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
 			GN_ARGS+=rtc_link_pipewire=true
 PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=false
 
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true \
 			PINCLUDES="-I${WRKSRC:H}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
 CHROMIUM_VER=			142.0.7444.265
 # See ${WRKSRC}/electron/DEPS for NODE_VER
-NODE_VER=			22.22.0
+NODE_VER=			22.22.1
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			e14bdcd1f72d62bca1d541b66da43130384ec213
 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
 SQUIRREL_MAC_VER=		0e5d146ba13101a1302d59ea6e6e0b3cace4ae38
 # See ${WRKSRC}/electron/DEPS for REACTIVEOBJC_VER
 REACTIVEOBJC_VER=		74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
 # See ${WRKSRC}/electron/DEPS for MANTLE_VER
 MANTLE_VER=			78d3966b3c331292ea29ec38661b25df0a245948
 # See ${WRKSRC}/electron/DEPS for ENGFLOW_RECLIENT_CONFIGS_VER
 ENGFLOW_RECLIENT_CONFIGS_VER=	955335c30a752e9ef7bff375baab5e0819b6c00d
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
 LLVM_DEFAULT=		21
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
 			c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
 			ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
 			nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
 			ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 CFLAGS+=		-Wno-error=implicit-function-declaration
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	AARCH64="" \
 		AMD64="@comment " \
 		I386="@comment " \
 		NOT_AARCH64="@comment "
 FFMPEG_TARGET=	arm64
 .elif ${ARCH} == "amd64"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="" \
 		I386="@comment " \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	x64
 .elif ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	AARCH64="@comment " \
 		AMD64="@comment " \
 		I386="" \
 		NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
 FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
 FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
 
 # Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-znotext
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 # rust
 MAKE_ENV+=	RUSTC_BOOTSTRAP=1
 GN_ARGS+=	enable_rust=true \
 		rust_sysroot_absolute="${LOCALBASE}"
 
 TEST_ENV+=	${MAKE_ENV} \
 		ELECTRON_OUT_DIR=${BUILDTYPE} \
 		LOCAL_GIT_DIRECTORY=${LOCALBASE} \
 		DISABLE_CRASH_REPORTER_TESTS=1
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build electron, you should have around 2GB of memory"
 	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 pre-extract:
 # Chromium source tarball is splitted into multiple fragments. Concatenate them
 # into a single one and manually extract it into WRKDIR.
 	@${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
 		${WRKSRC:H}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}
 	@cd ${WRKSRC:H} && \
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
 
 post-extract:
 # Move extracted sources to appropriate locations
 	${MV} ${WRKSRC:H}/chromium-${CHROMIUM_VER} ${WRKSRC}
 	${MV} ${WRKSRC:H}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
 	${MV} ${WRKSRC:H}/${GH_PROJECT_nan}-${NAN_VER} ${WRKSRC}/third_party/nan
 	${MV} ${WRKSRC:H}/${GH_PROJECT_node}-${NODE_VER} \
 		${WRKSRC}/third_party/electron_node
 	${MV} ${WRKSRC:H}/${GH_PROJECT_squirrel_mac}-${SQUIRREL_MAC_VER} \
 		${WRKSRC}/third_party/squirrel.mac
 	@${MKDIR} ${WRKSRC}/third_party/squirrel.mac/vendor
 	${MV} ${WRKSRC:H}/${GH_PROJECT_reactiveobjc}-${REACTIVEOBJC_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
 	${MV} ${WRKSRC:H}/${GH_PROJECT_mantle}-${MANTLE_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
 	${MV} ${WRKSRC:H}/${GH_PROJECT_reclient_configs}-${ENGFLOW_RECLIENT_CONFIGS_VER} \
 		${WRKSRC}/third_party/engflow-reclient-configs
 
 pre-patch:
+	${REINPLACE_CMD} -e 's|src/third_party/angle/src|src/third_party/angle|' \
+		${WRKSRC}/electron/patches/config.json
 	${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
 	# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
 	# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		dav1d flac fontconfig harfbuzz-ng libdrm libpng \
 		libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/media/ffmpeg && \
 		${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
 		--config-only --branding=${FFMPEG_BRAND}
 	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
 	${MKDIR} ${FFMPEG_CDIR}
 .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
 	-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
 .endfor
 	touch ${WRKSRC:H}/pulseaudio-${PULSEV}/src/pulse/version.h
 	@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
 		${WRKSRC}/build/config/rust.gni \
 		${WRKSRC}/build/linux/strip_binary.gni \
 		${WRKSRC}/build/rust/rust_bindgen.gni \
 		${WRKSRC}/build/rust/rust_bindgen_generator.gni
 
 do-configure:
 	@( \
 		echo "#ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_" ;\
 		echo "#define GPU_WEBGPU_DAWN_COMMIT_HASH_H_" ;\
 		echo "#define DAWN_COMMIT_HASH \"$$(cat ${WRKSRC}/gpu/webgpu/DAWN_VERSION)\"" ;\
 		echo "#endif  // GPU_WEBGPU_DAWN_COMMIT_HASH_H_" \
 	) > ${WRKSRC}/gpu/webgpu/dawn_commit_hash.h
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \
 		--args='import("//electron/build/args/${GN_FILE}") ${GN_ARGS}'
 
 	# Make GN available to python scripts called during build
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKDIR}/.bin
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node
 
 	# Setup buildtools/freebsd
 	@${MKDIR} ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 	${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS}
 
 post-build-DIST-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in electron mksnapshot v8_context_snapshot_generator
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in libEGL.so libGLESv2.so libffmpeg.so libvk_swiftshader.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 ${STAGEDIR}${DATADIR}/libvulkan.so
 .for f in LICENSE LICENSES.chromium.html snapshot_blob.bin v8_context_snapshot.bin version vk_swiftshader_icd.json
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/locales
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales
 	${MKDIR} ${STAGEDIR}${DATADIR}/resources
 .for f in default_app.asar
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
 .endfor
 	cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/electron/buildflags ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/v8/embedded.S ${STAGEDIR}${DATADIR}
 	${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
 
 post-install-DIST-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver.unstripped \
 		${STAGEDIR}${DATADIR}/chromedriver
 
 do-test:
 	cd ${WRKSRC}/electron && \
 	${SETENV} ${TEST_ENV} npm run test -- --ci
 
 .include <bsd.port.post.mk>
diff --git a/devel/electron39/Makefile.version b/devel/electron39/Makefile.version
index 0e1e39305a66..21579ecd6824 100644
--- a/devel/electron39/Makefile.version
+++ b/devel/electron39/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	39.8.0
+ELECTRON_VER=	39.8.3
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron39/distinfo b/devel/electron39/distinfo
index 9e8a43cc9815..34d969b86e41 100644
--- a/devel/electron39/distinfo
+++ b/devel/electron39/distinfo
@@ -1,27 +1,27 @@
-TIMESTAMP = 1772890775
+TIMESTAMP = 1773831601
 SHA256 (electron/chromium-142.0.7444.265.tar.xz.0) = 54ca3cf92f6a207a4e1b46fe016da7d515097f999b5e53ba4201adc906ae383e
 SIZE (electron/chromium-142.0.7444.265.tar.xz.0) = 2000000000
 SHA256 (electron/chromium-142.0.7444.265.tar.xz.1) = 289722408b81d862eb63f98cf47516308add8e18f5d62d2455c98942a2ebface
 SIZE (electron/chromium-142.0.7444.265.tar.xz.1) = 2000000000
 SHA256 (electron/chromium-142.0.7444.265.tar.xz.2) = fcce594020d7120080cd9b4a6af385983c8980dfdd3f72405b31b11fad41ffd5
 SIZE (electron/chromium-142.0.7444.265.tar.xz.2) = 227650760
 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
 SHA256 (electron/yarn-4.12.0.tgz) = bd58d06826ce9542c4cd904fe10bab7bc718ea2cc39a45d9fbd15f2edb45761c
 SIZE (electron/yarn-4.12.0.tgz) = 1056794
-SHA256 (electron/electron39-39.8.0-node-modules.tar.xz) = 0f539cfddfd0cbcf8df0e5a974a0c2a7cf812d7c1fd10ba2148a69265412ad5a
-SIZE (electron/electron39-39.8.0-node-modules.tar.xz) = 59894046
-SHA256 (electron/electron-electron-v39.8.0_GH0.tar.gz) = 0d2bf4f74a7f5ccc2686f2b61580f2f08860dc2a5b48bfe09cbc8869470761a5
-SIZE (electron/electron-electron-v39.8.0_GH0.tar.gz) = 17143914
-SHA256 (electron/nodejs-node-v22.22.0_GH0.tar.gz) = b7f40aadbf71df0d78a2239f593e4f14bf2f129fd9c5643f024c68ec1b48a854
-SIZE (electron/nodejs-node-v22.22.0_GH0.tar.gz) = 129435366
+SHA256 (electron/electron39-39.8.3-node-modules.tar.xz) = 0f539cfddfd0cbcf8df0e5a974a0c2a7cf812d7c1fd10ba2148a69265412ad5a
+SIZE (electron/electron39-39.8.3-node-modules.tar.xz) = 59894046
+SHA256 (electron/electron-electron-v39.8.3_GH0.tar.gz) = 294c6df630f84152ef0f66a9a4a02d89e9aaf2a53c27ea183ecb19d615530159
+SIZE (electron/electron-electron-v39.8.3_GH0.tar.gz) = 17160436
+SHA256 (electron/nodejs-node-v22.22.1_GH0.tar.gz) = 4d9ebbac6ba3f9610fdd5449274794a3b32305b33ca6f2fd476ac139024015c6
+SIZE (electron/nodejs-node-v22.22.1_GH0.tar.gz) = 129747267
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
 SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646
 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01
 SIZE (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = 2112918
 SHA256 (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 88e65f116c7a06fccedb43970fba63080a57a4e5dc29147d2cdfe1ee58dd0546
 SIZE (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 1136238
 SHA256 (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = a365df6d83e0be3cc000b70bd39734d80c28f0d9983ebe44698337a2ca464bb1
 SIZE (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = 62962
 SHA256 (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = c148f76220fc41a89ffeaf370c2cc175577be184688b12aa6fec5f8ac6c714c4
 SIZE (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = 13014
diff --git a/devel/electron39/files/patch-electron_filenames.gni b/devel/electron39/files/patch-electron_filenames.gni
index f8c4bda94c1f..6d8c888188c5 100644
--- a/devel/electron39/files/patch-electron_filenames.gni
+++ b/devel/electron39/files/patch-electron_filenames.gni
@@ -1,13 +1,13 @@
---- electron/filenames.gni.orig	2025-09-02 20:56:04 UTC
+--- electron/filenames.gni.orig	2026-03-17 08:46:38 UTC
 +++ electron/filenames.gni
-@@ -238,8 +238,8 @@ filenames = {
+@@ -240,8 +240,8 @@ filenames = {
      "shell/app/command_line_args.h",
      "shell/app/electron_content_client.cc",
      "shell/app/electron_content_client.h",
 -    "shell/app/electron_crash_reporter_client.cc",
 -    "shell/app/electron_crash_reporter_client.h",
 +    # "shell/app/electron_crash_reporter_client.cc",
 +    # "shell/app/electron_crash_reporter_client.h",
      "shell/app/electron_main_delegate.cc",
      "shell/app/electron_main_delegate.h",
      "shell/app/node_main.cc",
diff --git a/devel/electron39/files/patch-electron_lib_browser_api_power-monitor.ts b/devel/electron39/files/patch-electron_lib_browser_api_power-monitor.ts
index 24713c283fe7..144f1bfe462c 100644
--- a/devel/electron39/files/patch-electron_lib_browser_api_power-monitor.ts
+++ b/devel/electron39/files/patch-electron_lib_browser_api_power-monitor.ts
@@ -1,11 +1,11 @@
---- electron/lib/browser/api/power-monitor.ts.orig	2023-08-14 18:19:06 UTC
+--- electron/lib/browser/api/power-monitor.ts.orig	2026-03-17 08:46:38 UTC
 +++ electron/lib/browser/api/power-monitor.ts
-@@ -17,7 +17,7 @@ class PowerMonitor extends EventEmitter {
-       const pm = createPowerMonitor();
+@@ -23,7 +23,7 @@ class PowerMonitor extends EventEmitter implements Ele
+       pm = createPowerMonitor();
        pm.emit = this.emit.bind(this);
  
 -      if (process.platform === 'linux') {
 +      if (process.platform === 'linux' || process.platform === 'freebsd') {
          // On Linux, we inhibit shutdown in order to give the app a chance to
          // decide whether or not it wants to prevent the shutdown. We don't
          // inhibit the shutdown event unless there's a listener for it. This
diff --git a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc
index bca4a85e06ed..454c2994b075 100644
--- a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc
+++ b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc
@@ -1,23 +1,23 @@
---- electron/shell/browser/api/electron_api_power_monitor.cc.orig	2025-09-02 20:56:04 UTC
+--- electron/shell/browser/api/electron_api_power_monitor.cc.orig	2026-03-17 08:46:38 UTC
 +++ electron/shell/browser/api/electron_api_power_monitor.cc
-@@ -129,6 +129,11 @@ void PowerMonitor::OnSpeedLimitChange(int speed_limit)
+@@ -137,6 +137,11 @@ void PowerMonitor::OnSpeedLimitChange(int speed_limit)
        gin::DataObjectBuilder(isolate).Set("limit", speed_limit).Build());
  }
  
 +#if BUILDFLAG(IS_BSD)
 +void PowerMonitor::SetListeningForShutdown(bool is_listening) {
 +}
 +#endif
 +
  #if BUILDFLAG(IS_LINUX)
  void PowerMonitor::SetListeningForShutdown(bool is_listening) {
    if (is_listening) {
-@@ -154,7 +159,7 @@ gin::ObjectTemplateBuilder PowerMonitor::GetObjectTemp
+@@ -162,7 +167,7 @@ gin::ObjectTemplateBuilder PowerMonitor::GetObjectTemp
    auto builder =
        gin_helper::EventEmitterMixin<PowerMonitor>::GetObjectTemplateBuilder(
            isolate);
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    builder.SetMethod("setListeningForShutdown",
                      &PowerMonitor::SetListeningForShutdown);
  #endif
diff --git a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__screen.cc b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__screen.cc
index a8f1c681f88c..2515ba44e617 100644
--- a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__screen.cc
+++ b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__screen.cc
@@ -1,38 +1,47 @@
---- electron/shell/browser/api/electron_api_screen.cc.orig	2025-07-02 10:12:01 UTC
+--- electron/shell/browser/api/electron_api_screen.cc.orig	2026-03-17 08:46:38 UTC
 +++ electron/shell/browser/api/electron_api_screen.cc
 @@ -28,7 +28,7 @@
  #include "ui/display/win/screen_win.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "shell/browser/linux/x11_util.h"
  #endif
  
-@@ -136,7 +136,7 @@ gfx::PointF Screen::ScreenToDIPPoint(const gfx::PointF
+@@ -77,7 +77,7 @@ gfx::Point Screen::GetCursorScreenPoint(v8::Isolate* i
+ }
+ 
+ gfx::Point Screen::GetCursorScreenPoint(v8::Isolate* isolate) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (x11_util::IsWayland())
+     return {};
+ #endif
+@@ -125,7 +125,7 @@ gfx::PointF Screen::ScreenToDIPPoint(const gfx::PointF
  gfx::PointF Screen::ScreenToDIPPoint(const gfx::PointF& point_px) {
  #if BUILDFLAG(IS_WIN)
    return display::win::GetScreenWin()->ScreenToDIPPoint(point_px);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (x11_util::IsX11()) {
      gfx::Point pt_px = gfx::ToFlooredPoint(point_px);
      display::Display display = GetDisplayNearestPoint(pt_px);
-@@ -155,7 +155,7 @@ gfx::Point Screen::DIPToScreenPoint(const gfx::Point& 
+@@ -144,7 +144,7 @@ gfx::Point Screen::DIPToScreenPoint(const gfx::Point& 
  gfx::Point Screen::DIPToScreenPoint(const gfx::Point& point_dip) {
  #if BUILDFLAG(IS_WIN)
    return display::win::GetScreenWin()->DIPToScreenPoint(point_dip);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (x11_util::IsX11()) {
      display::Display display = GetDisplayNearestPoint(point_dip);
      gfx::Rect bounds_dip = display.bounds();
-@@ -198,7 +198,7 @@ gin::ObjectTemplateBuilder Screen::GetObjectTemplateBu
+@@ -187,7 +187,7 @@ gin::ObjectTemplateBuilder Screen::GetObjectTemplateBu
        .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
        .SetMethod("getAllDisplays", &Screen::GetAllDisplays)
        .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
        .SetMethod("screenToDipPoint", &Screen::ScreenToDIPPoint)
        .SetMethod("dipToScreenPoint", &Screen::DIPToScreenPoint)
  #endif
diff --git a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index d7a322e4b9a5..1a8581eaa002 100644
--- a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
@@ -1,77 +1,77 @@
---- electron/shell/browser/api/electron_api_web_contents.cc.orig	2026-03-03 14:13:37 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2026-03-17 08:46:38 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
 @@ -162,11 +162,11 @@
  #include "ui/base/cocoa/defaults_utils.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/linux/linux_ui.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "ui/aura/window.h"
  #include "ui/gfx/font_render_params.h"
  #endif
 @@ -198,7 +198,7 @@
  #include "content/public/browser/plugin_service.h"
  #endif
  
 -#if !IS_MAS_BUILD()
 +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD)
  #include "chrome/browser/hang_monitor/hang_crash_dump.h"  // nogncheck
  #endif
  
 @@ -572,7 +572,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
        ui::TextInsertionCaretBlinkPeriodFromDefaults());
    if (system_value)
      return *system_value;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (auto* native_theme = ui::NativeTheme::GetInstanceForNativeUi())
      return native_theme->caret_blink_interval();
  #elif BUILDFLAG(IS_WIN)
 @@ -937,7 +937,7 @@ void WebContents::InitWithSessionAndOptions(
    accept_languages.pop_back();
    prefs->accept_languages = accept_languages;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    // Update font settings.
    static const gfx::FontRenderParams params(
        gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-@@ -2727,13 +2727,13 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2742,13 +2742,13 @@ void WebContents::ForcefullyCrashRenderer() {
  
    content::RenderProcessHost* rph = rwh->GetProcess();
    if (rph) {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      // A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
      // Instead we send an explicit IPC to crash on the renderer's IO thread.
      rph->ForceCrash();
  #else
      // Try to generate a crash report for the hung process.
 -#if !IS_MAS_BUILD()
 +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD)
      CrashDumpHungChildProcess(rph->GetProcess().Handle());
  #endif
      rph->Shutdown(content::RESULT_CODE_HUNG);
-@@ -3417,7 +3417,7 @@ void WebContents::Focus() {
+@@ -3432,7 +3432,7 @@ void WebContents::Focus() {
  void WebContents::Focus() {
    // Focusing on WebContents does not automatically focus the window on macOS
    // and Linux, do it manually to match the behavior on Windows.
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (owner_window())
      owner_window()->Focus(true);
  #endif
-@@ -4308,7 +4308,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4323,7 +4323,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
  }
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void WebContents::GetDevToolsWindowWMClass(std::string* name,
                                             std::string* class_name) {
    *class_name = Browser::Get()->GetName();
diff --git a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.h
index 598d75144012..df26d1097ebe 100644
--- a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.h
+++ b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.h
@@ -1,11 +1,11 @@
---- electron/shell/browser/api/electron_api_web_contents.h.orig	2026-03-03 14:13:37 UTC
+--- electron/shell/browser/api/electron_api_web_contents.h.orig	2026-03-17 08:46:38 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.h
-@@ -746,7 +746,7 @@ class WebContents final : public ExclusiveAccessContex
+@@ -750,7 +750,7 @@ class WebContents final : public ExclusiveAccessContex
  #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
    ui::ImageModel GetDevToolsWindowIcon() override;
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    void GetDevToolsWindowWMClass(std::string* name,
                                  std::string* class_name) override;
  #endif
diff --git a/devel/electron39/files/patch-electron_shell_browser_browser.cc b/devel/electron39/files/patch-electron_shell_browser_browser.cc
index d4c7f912e1c6..4148b7978441 100644
--- a/devel/electron39/files/patch-electron_shell_browser_browser.cc
+++ b/devel/electron39/files/patch-electron_shell_browser_browser.cc
@@ -1,11 +1,11 @@
---- electron/shell/browser/browser.cc.orig	2025-01-29 20:10:57 UTC
+--- electron/shell/browser/browser.cc.orig	2026-03-17 08:46:38 UTC
 +++ electron/shell/browser/browser.cc
-@@ -71,7 +71,7 @@ Browser* Browser::Get() {
-   return ElectronBrowserMainParts::Get()->browser();
+@@ -96,7 +96,7 @@ bool Browser::IsValidProtocolScheme(const std::string&
+   return true;
  }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void Browser::Focus(gin::Arguments* args) {
    // Focus on the first visible window.
    for (auto* const window : WindowList::GetWindows()) {
diff --git a/devel/electron39/files/patch-electron_shell_browser_browser.h b/devel/electron39/files/patch-electron_shell_browser_browser.h
index a24bbdb011f0..08b8f53c04cd 100644
--- a/devel/electron39/files/patch-electron_shell_browser_browser.h
+++ b/devel/electron39/files/patch-electron_shell_browser_browser.h
@@ -1,24 +1,24 @@
---- electron/shell/browser/browser.h.orig	2025-10-27 17:58:27 UTC
+--- electron/shell/browser/browser.h.orig	2026-03-17 08:46:38 UTC
 +++ electron/shell/browser/browser.h
-@@ -148,7 +148,7 @@ class Browser : private WindowListObserver {
+@@ -152,7 +152,7 @@ class Browser : private WindowListObserver {
  
    std::u16string GetApplicationNameForProtocol(const GURL& url);
  
 -#if !BUILDFLAG(IS_LINUX)
 +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
    // get the name, icon and path for an application
    v8::Local<v8::Promise> GetApplicationInfoForProtocol(v8::Isolate* isolate,
                                                         const GURL& url);
-@@ -276,10 +276,10 @@ class Browser : private WindowListObserver {
+@@ -280,10 +280,10 @@ class Browser : private WindowListObserver {
    PCWSTR GetAppUserModelID();
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Whether Unity launcher is running.
    bool IsUnityRunning();
 -#endif  // BUILDFLAG(IS_LINUX)
 +#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  
    // Tell the application to open a file.
    bool OpenFile(const std::string& file_path);
diff --git a/devel/electron39/files/patch-electron_shell_browser_linux_x11__util.cc b/devel/electron39/files/patch-electron_shell_browser_linux_x11__util.cc
new file mode 100644
index 000000000000..10daeb46ef5d
--- /dev/null
+++ b/devel/electron39/files/patch-electron_shell_browser_linux_x11__util.cc
@@ -0,0 +1,20 @@
+--- electron/shell/browser/linux/x11_util.cc.orig	2026-03-18 13:26:09 UTC
++++ electron/shell/browser/linux/x11_util.cc
+@@ -10,7 +10,7 @@ bool IsX11() {
+ namespace x11_util {
+ 
+ bool IsX11() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   static const bool is = ui::GetOzonePlatformId() == ui::kPlatformX11;
+   return is;
+ #else
+@@ -19,7 +19,7 @@ bool IsWayland() {
+ }
+ 
+ bool IsWayland() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   static const bool is = ui::GetOzonePlatformId() == ui::kPlatformWayland;
+   return is;
+ #else
diff --git a/devel/electron39/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron39/files/patch-electron_shell_browser_native__window__views.cc
index 01f86420cf54..0b81c6302dd3 100644
--- a/devel/electron39/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron39/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,191 +1,191 @@
---- electron/shell/browser/native_window_views.cc.orig	2025-11-13 22:50:46 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2026-03-17 08:46:38 UTC
 +++ electron/shell/browser/native_window_views.cc
 @@ -53,7 +53,7 @@
  #include "ui/wm/core/shadow_types.h"
  #include "ui/wm/core/window_util.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/notimplemented.h"
  #include "shell/browser/browser.h"
  #include "shell/browser/linux/unity_service.h"
 @@ -283,7 +283,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
      params.parent = parent->GetNativeWindow();
  
    params.native_widget = new ElectronDesktopNativeWidgetAura{this, widget()};
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    std::string name = Browser::Get()->GetName();
    // Set WM_WINDOW_ROLE.
    params.wm_role_name = "browser-window";
 @@ -308,7 +308,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
    std::string window_type;
    options.Get(options::kType, &window_type);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
    if (options.ValueOrDefault(options::kDarkTheme, false))
      SetGTKDarkThemeEnabled(true);
 @@ -429,7 +429,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
    if (window)
      window->AddPreTargetHandler(this);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On linux after the widget is initialized we might have to force set the
    // bounds if the bounds are smaller than the current display
    SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
 @@ -503,7 +503,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us
  }
  
  void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (x11_util::IsX11()) {
      const std::string color = use_dark_theme ? "dark" : "light";
      auto* connection = x11::Connection::Get();
 @@ -564,7 +564,7 @@ void NativeWindowViews::Show() {
  
    NotifyWindowShow();
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (global_menu_bar_)
      global_menu_bar_->OnWindowMapped();
  
 @@ -580,7 +580,7 @@ void NativeWindowViews::ShowInactive() {
  
    NotifyWindowShow();
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (global_menu_bar_)
      global_menu_bar_->OnWindowMapped();
  
 @@ -599,7 +599,7 @@ void NativeWindowViews::Hide() {
  
    NotifyWindowHide();
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (global_menu_bar_)
      global_menu_bar_->OnWindowUnmapped();
  #endif
 @@ -630,7 +630,7 @@ bool NativeWindowViews::IsEnabled() const {
  bool NativeWindowViews::IsEnabled() const {
  #if BUILDFLAG(IS_WIN)
    return ::IsWindowEnabled(GetAcceleratedWidget());
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (x11_util::IsX11())
      return !event_disabler_.get();
    NOTIMPLEMENTED();
-@@ -864,7 +864,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -855,7 +855,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
    }
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On Linux and Windows the minimum and maximum size should be updated with
    // window size when window is not resizable.
    if (!CanResize()) {
-@@ -1124,7 +1124,7 @@ bool NativeWindowViews::IsClosable() const {
+@@ -1111,7 +1111,7 @@ bool NativeWindowViews::IsClosable() const {
      return false;
    }
    return !(info.fState & MFS_DISABLED);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return true;
  #endif
  }
-@@ -1164,7 +1164,7 @@ void NativeWindowViews::Center() {
+@@ -1151,7 +1151,7 @@ void NativeWindowViews::Center() {
  // for now to avoid breaking API contract, but should consider the long
  // term plan for this aligning with upstream.
  void NativeWindowViews::Center() {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto display =
        display::Screen::Get()->GetDisplayNearestWindow(GetNativeWindow());
    gfx::Rect window_bounds_in_screen = display.work_area();
-@@ -1381,7 +1381,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
+@@ -1368,7 +1368,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
  }
  
  void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Remove global menu bar.
    if (global_menu_bar_ && menu_model == nullptr) {
      global_menu_bar_.reset();
-@@ -1437,7 +1437,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* 
+@@ -1424,7 +1424,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* 
  void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
    NativeWindow::SetParentWindow(parent);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (x11_util::IsX11()) {
      auto* connection = x11::Connection::Get();
      connection->SetProperty(
-@@ -1483,7 +1483,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1470,7 +1470,7 @@ void NativeWindowViews::SetProgressBar(double progress
                                         NativeWindow::ProgressState state) {
  #if BUILDFLAG(IS_WIN)
    taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (unity::IsRunning()) {
      unity::SetProgressFraction(progress);
    }
-@@ -1609,7 +1609,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1596,7 +1596,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
  #if BUILDFLAG(IS_WIN)
    window_handle =
        reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    window_handle = static_cast<uint32_t>(accelerated_widget);
  #endif
    aura::WindowTreeHost* const host =
-@@ -1707,7 +1707,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1694,7 +1694,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
    SendMessage(hwnd, WM_SETICON, ICON_BIG,
                reinterpret_cast<LPARAM>(app_icon_.get()));
  }
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
    auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
        GetAcceleratedWidget());
-@@ -1828,7 +1828,7 @@ bool NativeWindowViews::CanMinimize() const {
+@@ -1815,7 +1815,7 @@ bool NativeWindowViews::CanMinimize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if BUILDFLAG(IS_WIN)
    return minimizable_;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return true;
  #endif
  }
-@@ -1870,7 +1870,7 @@ std::unique_ptr<views::FrameView> NativeWindowViews::C
+@@ -1857,7 +1857,7 @@ std::unique_ptr<views::FrameView> NativeWindowViews::C
  #endif
  }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  electron::ClientFrameViewLinux* NativeWindowViews::GetClientFrameViewLinux() {
    // Check to make sure this window's non-client frame view is a
    // ClientFrameViewLinux.  If either has_frame() or has_client_frame()
-@@ -1893,7 +1893,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1880,7 +1880,7 @@ void NativeWindowViews::HandleKeyboardEvent(
    if (widget_destroyed_)
      return;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
      NotifyWindowExecuteAppCommand(kBrowserBackward);
    else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1912,7 +1912,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1899,7 +1899,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
    root_view_.ResetAltState();
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (event->changed_button_flags() == ui::EF_BACK_MOUSE_BUTTON)
      NotifyWindowExecuteAppCommand(kBrowserBackward);
    else if (event->changed_button_flags() == ui::EF_FORWARD_MOUSE_BUTTON)
diff --git a/devel/electron39/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc b/devel/electron39/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc
index 407fbfe7b4c6..8de5a24ff8e6 100644
--- a/devel/electron39/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc
+++ b/devel/electron39/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc
@@ -1,11 +1,11 @@
---- electron/shell/browser/ui/inspectable_web_contents.cc.orig	2025-11-13 22:50:46 UTC
+--- electron/shell/browser/ui/inspectable_web_contents.cc.orig	2026-03-17 08:46:38 UTC
 +++ electron/shell/browser/ui/inspectable_web_contents.cc
-@@ -555,7 +555,7 @@ void InspectableWebContents::LoadCompleted() {
+@@ -559,7 +559,7 @@ void InspectableWebContents::LoadCompleted() {
            prefs.FindString("currentDockState");
        base::RemoveChars(*current_dock_state, "\"", &dock_state_);
      }
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      auto* api_web_contents = api::WebContents::From(GetWebContents());
      if (api_web_contents) {
        auto* win =
diff --git a/devel/electron39/files/patch-electron_spec_api-app-spec.ts b/devel/electron39/files/patch-electron_spec_api-app-spec.ts
index 5125e2072163..dce72043d131 100644
--- a/devel/electron39/files/patch-electron_spec_api-app-spec.ts
+++ b/devel/electron39/files/patch-electron_spec_api-app-spec.ts
@@ -1,133 +1,133 @@
---- electron/spec/api-app-spec.ts.orig	2025-11-13 22:50:46 UTC
+--- electron/spec/api-app-spec.ts.orig	2026-03-17 08:46:38 UTC
 +++ electron/spec/api-app-spec.ts
 @@ -129,11 +129,11 @@ describe('app module', () => {
    });
  
    describe('app.getPreferredSystemLanguages()', () => {
 -    ifit(process.platform !== 'linux')('should not be empty', () => {
 +    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be empty', () => {
        expect(app.getPreferredSystemLanguages().length).to.not.equal(0);
      });
  
 -    ifit(process.platform === 'linux')('should be empty or contain C entry', () => {
 +    ifit(process.platform === 'linux' || process.platform === 'freebsd')('should be empty or contain C entry', () => {
        const languages = app.getPreferredSystemLanguages();
        if (languages.length) {
          expect(languages).to.not.include('C');
 @@ -202,7 +202,7 @@ describe('app module', () => {
        expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound');
      });
  
 -    ifit(['darwin', 'linux'].includes(process.platform))('exits gracefully', async function () {
 +    ifit(['darwin', 'linux', 'freebsd'].includes(process.platform))('exits gracefully', async function () {
        const electronPath = process.execPath;
        const appPath = path.join(fixturesPath, 'api', 'singleton');
        appProcess = cp.spawn(electronPath, [appPath]);
 @@ -366,7 +366,7 @@ describe('app module', () => {
    });
  
    // GitHub Actions macOS-13 runners used for x64 seem to have a problem with this test.
 -  ifdescribe(process.platform !== 'linux' && !isMacOSx64)('app.{add|get|clear}RecentDocument(s)', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd' && !isMacOSx64)('app.{add|get|clear}RecentDocument(s)', () => {
      const tempFiles = [
        path.join(fixturesPath, 'foo.txt'),
        path.join(fixturesPath, 'bar.txt'),
 @@ -494,7 +494,7 @@ describe('app module', () => {
    //   let w = null
  
    //   before(function () {
 -  //     if (process.platform !== 'linux') {
 +  //     if (process.platform !== 'linux' && process.platform !== 'freebsd') {
    //       this.skip()
    //     }
    //   })
 @@ -601,7 +601,7 @@ describe('app module', () => {
    describe('app.badgeCount', () => {
      const platformIsNotSupported =
        (process.platform === 'win32') ||
 -      (process.platform === 'linux' && !app.isUnityRunning());
 +      (process.platform === 'linux' && !app.isUnityRunning()) || (process.platform === 'freebsd');
  
      const expectedBadgeCount = 42;
  
 @@ -645,7 +645,7 @@ describe('app module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux' && !process.mas && (process.platform !== 'darwin' || process.arch === 'arm64'))('app.get/setLoginItemSettings API', function () {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd' && !process.mas && (process.platform !== 'darwin' || process.arch === 'arm64'))('app.get/setLoginItemSettings API', function () {
      const isMac = process.platform === 'darwin';
      const isWin = process.platform === 'win32';
  
 @@ -1025,7 +1025,7 @@ describe('app module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux')('accessibility support functionality', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('accessibility support functionality', () => {
      it('is mutable', () => {
        const values = [false, true, false];
        const setters: Array<(arg: boolean) => void> = [
 @@ -1294,7 +1294,7 @@ describe('app module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux')('select-client-certificate event', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('select-client-certificate event', () => {
      let w: BrowserWindow;
  
      before(function () {
 @@ -1429,7 +1429,7 @@ describe('app module', () => {
  
    describe('getApplicationNameForProtocol()', () => {
      // TODO: Linux CI doesn't have registered http & https handlers
 -    ifit(!(process.env.CI && process.platform === 'linux'))('returns application names for common protocols', function () {
 +    ifit(!(process.env.CI && (process.platform === 'linux' || process.platform === 'freebsd')))('returns application names for common protocols', function () {
        // We can't expect particular app names here, but these protocols should
        // at least have _something_ registered. Except on our Linux CI
        // environment apparently.
 @@ -1447,7 +1447,7 @@ describe('app module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux')('getApplicationInfoForProtocol()', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getApplicationInfoForProtocol()', () => {
      it('returns promise rejection for a bogus protocol', async function () {
        await expect(
          app.getApplicationInfoForProtocol('bogus-protocol://')
-@@ -1497,7 +1497,7 @@ describe('app module', () => {
+@@ -1520,7 +1520,7 @@ describe('app module', () => {
    });
  
    // FIXME Get these specs running on Linux CI
 -  ifdescribe(process.platform !== 'linux')('getFileIcon() API', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getFileIcon() API', () => {
      const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico');
      const sizes = {
        small: 16,
-@@ -1579,7 +1579,7 @@ describe('app module', () => {
+@@ -1602,7 +1602,7 @@ describe('app module', () => {
            expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0);
          }
  
 -        if (process.platform !== 'linux') {
 +        if (process.platform !== 'linux' && process.platform !== 'freebsd') {
            expect(entry.sandboxed).to.be.a('boolean');
          }
  
-@@ -1653,7 +1653,7 @@ describe('app module', () => {
+@@ -1676,7 +1676,7 @@ describe('app module', () => {
  
      it('succeeds with complete GPUInfo', async () => {
        const completeInfo = await getGPUInfo('complete');
 -      if (process.platform === 'linux') {
 +      if (process.platform === 'linux' || process.platform === 'freebsd') {
          // For linux and macOS complete info is same as basic info
          await verifyBasicGPUInfo(completeInfo);
          const basicInfo = await getGPUInfo('basic');
-@@ -1677,7 +1677,7 @@ describe('app module', () => {
+@@ -1700,7 +1700,7 @@ describe('app module', () => {
      });
    });
  
 -  ifdescribe(!(process.platform === 'linux' && (process.arch === 'arm64' || process.arch === 'arm')))('sandbox options', () => {
 +  ifdescribe(!((process.platform === 'linux' || process.platform === 'freebsd') && (process.arch === 'arm64' || process.arch === 'arm')))('sandbox options', () => {
      let appProcess: cp.ChildProcess = null as any;
      let server: net.Server = null as any;
      const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox';
diff --git a/devel/electron39/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron39/files/patch-electron_spec_api-browser-window-spec.ts
index 50a523d9eef6..7326e8ea2a21 100644
--- a/devel/electron39/files/patch-electron_spec_api-browser-window-spec.ts
+++ b/devel/electron39/files/patch-electron_spec_api-browser-window-spec.ts
@@ -1,191 +1,182 @@
---- electron/spec/api-browser-window-spec.ts.orig	2026-03-03 14:13:37 UTC
+--- electron/spec/api-browser-window-spec.ts.orig	2026-03-17 08:46:38 UTC
 +++ electron/spec/api-browser-window-spec.ts
 @@ -69,7 +69,7 @@ describe('BrowserWindow module', () => {
        }).not.to.throw();
      });
  
 -    ifit(process.platform === 'linux')('does not crash when setting large window icons', async () => {
 +    ifit(process.platform === 'linux' || process.platform === 'freebsd')('does not crash when setting large window icons', async () => {
        const appPath = path.join(fixtures, 'apps', 'xwindow-icon');
        const appProcess = childProcess.spawn(process.execPath, [appPath]);
        await once(appProcess, 'exit');
 @@ -326,7 +326,7 @@ describe('BrowserWindow module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux')('BrowserWindow.getContentProtection', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('BrowserWindow.getContentProtection', () => {
      afterEach(closeAllWindows);
      it('can set content protection', async () => {
        const w = new BrowserWindow({ show: false });
 @@ -1197,7 +1197,7 @@ describe('BrowserWindow module', () => {
  
      describe('BrowserWindow.minimize()', () => {
        // TODO(codebytere): Enable for Linux once maximize/minimize events work in CI.
 -      ifit(process.platform !== 'linux')('should not be visible when the window is minimized', async () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be visible when the window is minimized', async () => {
          const minimize = once(w, 'minimize');
          w.minimize();
          await minimize;
 @@ -1214,7 +1214,7 @@ describe('BrowserWindow module', () => {
        });
  
        // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests
 -      ifit(process.platform !== 'linux')('should not restore maximized windows', async () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not restore maximized windows', async () => {
          const maximize = once(w, 'maximize');
          const shown = once(w, 'show');
          w.maximize();
 @@ -1279,7 +1279,7 @@ describe('BrowserWindow module', () => {
          expect(w.isFocused()).to.equal(true);
        });
  
 -      ifit(process.platform !== 'linux')('acquires focus status from the other windows', async () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('acquires focus status from the other windows', async () => {
          const w1 = new BrowserWindow({ show: false });
          const w2 = new BrowserWindow({ show: false });
          const w3 = new BrowserWindow({ show: false });
 @@ -1381,7 +1381,7 @@ describe('BrowserWindow module', () => {
          expect(w.isFocused()).to.equal(false);
        });
  
 -      ifit(process.platform !== 'linux')('transfers focus status to the next window', async () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('transfers focus status to the next window', async () => {
          const w1 = new BrowserWindow({ show: false });
          const w2 = new BrowserWindow({ show: false });
          const w3 = new BrowserWindow({ show: false });
 @@ -1840,7 +1840,7 @@ describe('BrowserWindow module', () => {
          });
        });
  
 -      ifdescribe(process.platform !== 'linux')('Maximized state', () => {
 +      ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('Maximized state', () => {
          it('checks normal bounds when maximized', async () => {
            const bounds = w.getBounds();
            const maximize = once(w, 'maximize');
 @@ -2050,7 +2050,7 @@ describe('BrowserWindow module', () => {
          });
        });
  
 -      ifdescribe(process.platform !== 'linux')('Minimized state', () => {
 +      ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('Minimized state', () => {
          it('checks normal bounds when minimized', async () => {
            const bounds = w.getBounds();
            const minimize = once(w, 'minimize');
 @@ -3124,7 +3124,7 @@ describe('BrowserWindow module', () => {
    describe('BrowserWindow.setOpacity(opacity)', () => {
      afterEach(closeAllWindows);
  
 -    ifdescribe(process.platform !== 'linux')(('Windows and Mac'), () => {
 +    ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')(('Windows and Mac'), () => {
        it('make window with initial opacity', () => {
          const w = new BrowserWindow({ show: false, opacity: 0.5 });
          expect(w.getOpacity()).to.equal(0.5);
 @@ -3150,7 +3150,7 @@ describe('BrowserWindow module', () => {
        });
      });
  
 -    ifdescribe(process.platform === 'linux')(('Linux'), () => {
 +    ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')(('Linux'), () => {
        it('sets 1 regardless of parameter', () => {
          const w = new BrowserWindow({ show: false });
          w.setOpacity(0);
 @@ -3361,7 +3361,7 @@ describe('BrowserWindow module', () => {
        expect(overlayRectPreMax.height).to.equal(size);
  
        // 'maximize' event is not emitted on Linux in CI.
 -      if (process.platform !== 'linux' && !w.isMaximized()) {
 +      if ((process.platform !== 'linux' && process.platform !== 'freebsd') && !w.isMaximized()) {
          const maximize = once(w, 'maximize');
          w.show();
          w.maximize();
 @@ -3427,7 +3427,7 @@ describe('BrowserWindow module', () => {
          expect(preMaxHeight).to.equal(size);
  
          // 'maximize' event is not emitted on Linux in CI.
 -        if (process.platform !== 'linux' && !w.isMaximized()) {
 +        if ((process.platform !== 'linux' && process.platform !== 'freebsd') && !w.isMaximized()) {
            const maximize = once(w, 'maximize');
            w.show();
            w.maximize();
 @@ -4120,7 +4120,7 @@ describe('BrowserWindow module', () => {
          expect(test.nodeTimers).to.equal(true);
          expect(test.nodeUrl).to.equal(true);
  
 -        if (process.platform === 'linux' && test.osSandbox) {
 +        if ((process.platform === 'linux' || process.platform === 'freebsd') && test.osSandbox) {
            expect(test.creationTime).to.be.null('creation time');
            expect(test.systemMemoryInfo).to.be.null('system memory info');
          } else {
 @@ -4625,7 +4625,7 @@ describe('BrowserWindow module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux')('max/minimize events', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('max/minimize events', () => {
      afterEach(closeAllWindows);
      it('emits an event when window is maximized', async () => {
        const w = new BrowserWindow({ show: false });
 @@ -4896,7 +4896,7 @@ describe('BrowserWindow module', () => {
      // TODO(zcbenz):
      // This test does not run on Linux CI. See:
      // https://github.com/electron/electron/issues/28699
 -    ifit(process.platform === 'linux' && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => {
 +    ifit((process.platform === 'linux' || process.platform === 'freebsd') && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => {
        const w = new BrowserWindow({});
        const maximize = once(w, 'maximize');
        w.maximize();
 @@ -4913,7 +4913,7 @@ describe('BrowserWindow module', () => {
    });
  
    // TODO(dsanders11): Enable once maximize event works on Linux again on CI
 -  ifdescribe(process.platform !== 'linux')('BrowserWindow.maximize()', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('BrowserWindow.maximize()', () => {
      afterEach(closeAllWindows);
      it('should show the window if it is not currently shown', async () => {
        const w = new BrowserWindow({ show: false });
 @@ -4950,7 +4950,7 @@ describe('BrowserWindow module', () => {
  
      // TODO(dsanders11): Enable once minimize event works on Linux again.
      //                   See https://github.com/electron/electron/issues/28699
 -    ifit(process.platform !== 'linux')('should not restore a minimized window', async () => {
 +    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not restore a minimized window', async () => {
        const w = new BrowserWindow();
        const minimize = once(w, 'minimize');
        w.minimize();
 @@ -5436,7 +5436,7 @@ describe('BrowserWindow module', () => {
        });
  
        // On Linux there is no "resizable" property of a window.
 -      ifit(process.platform !== 'linux')('does affect maximizability when disabled and enabled', () => {
 +      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('does affect maximizability when disabled and enabled', () => {
          const w = new BrowserWindow({ show: false });
          expect(w.resizable).to.be.true('resizable');
  
 @@ -5676,7 +5676,7 @@ describe('BrowserWindow module', () => {
      });
    });
  
 -  ifdescribe(process.platform !== 'linux')('window states (excluding Linux)', () => {
 +  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('window states (excluding Linux)', () => {
      // Not implemented on Linux.
      afterEach(closeAllWindows);
  
-@@ -5910,7 +5910,7 @@ describe('BrowserWindow module', () => {
-       });
-     });
- 
--    ifdescribe(process.platform === 'linux')('menu bar AltGr behavior', () => {
-+    ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')('menu bar AltGr behavior', () => {
-       it('does not toggle auto-hide menu bar visibility', async () => {
-         const w = new BrowserWindow({ show: false, autoHideMenuBar: true });
-         w.setMenuBarVisibility(false);
-@@ -6864,7 +6864,7 @@ describe('BrowserWindow module', () => {
+@@ -6858,7 +6858,7 @@ describe('BrowserWindow module', () => {
    describe('"transparent" option', () => {
      afterEach(closeAllWindows);
  
 -    ifit(process.platform !== 'linux')('correctly returns isMaximized() when the window is maximized then minimized', async () => {
 +    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('correctly returns isMaximized() when the window is maximized then minimized', async () => {
        const w = new BrowserWindow({
          frame: false,
          transparent: true