diff --git a/devel/electron18/Makefile b/devel/electron18/Makefile
index 82ea3bbecddb..728b6467b0e5 100644
--- a/devel/electron18/Makefile
+++ b/devel/electron18/Makefile
@@ -1,354 +1,354 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v18.2.4/:chromium \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
 		${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
 		${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
 FETCH_DEPENDS=		yarn-node16>0:www/yarn-node16
 EXTRACT_DEPENDS=	yarn-node16>0:www/yarn-node16
 PATCH_DEPENDS=		git:devel/git
 BUILD_DEPENDS=		gperf:devel/gperf \
 			yasm:devel/yasm \
 			${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
 			${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 			node16>0:www/node16 \
 			npm-node16>0:www/npm-node16
 LIB_DEPENDS=		libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 			libatspi.so:accessibility/at-spi2-core \
 			libsnappy.so:archivers/snappy \
 			libFLAC.so:audio/flac \
 			libopus.so:audio/opus \
 			libdbus-1.so:devel/dbus \
 			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 \
 			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} \
 			npm-node16>0:www/npm-node16
 
 USES=		bison compiler:c++17-lang cpe gettext-tools gl gnome iconv \
 		jpeg localbase:ldflags ninja pkgconfig python:build,test \
 		shebangfix tar:xz xorg
 CPE_VENDOR=	electronjs
 USE_GITHUB=	yes
 GH_TAGNAME=	${DISTVERSIONPREFIX}${ELECTRON_VER}
 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
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 libxml2 libxslt pango
 USE_LDCONFIG=	${DATADIR}
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
 		xrender xscrnsaver xtst
 
 SHEBANG_FILES=	buildtools/linux64/clang-format
 
 MAKE_ARGS=			-C out/${BUILDTYPE}
 MAKE_ENV+=			C_INCLUDE_PATH=${LOCALBASE}/include \
 				CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 ALL_TARGET=			electron third_party/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}
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 OPTIONS_DEFINE=		CUPS DEBUG DIST DRIVER KERBEROS LTO
 OPTIONS_DEFAULT=	CUPS DRIVER KERBEROS ALSA
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_SUB=		yes
 
 DIST_DESC=	Build distribution zip files
 DRIVER_DESC=	Install chromedriver
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_FILE=testing.gn \
 			GN_ARGS+=is_debug=true \
 			GN_BOOTSTRAP_FLAGS+=--debug
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_FILE=release.gn \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=symbol_level=0
 DIST_IMPLIES=		DRIVER
 DRIVER_ALL_TARGET=	chromedriver
 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
 LTO_VARS_OFF=		GN_ARGS+=use_thin_lto=false
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 # With SNDIO=on we exclude audio_manager_linux from the build (see
 # media/audio/BUILD.gn) and use audio_manager_openbsd which does not
 # support falling back to ALSA or PulseAudio.
 SNDIO_PREVENTS=		ALSA PULSEAUDIO
 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=			100.0.4896.160
 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
 CHROMIUM_NODE_MODULES_HASH=	aad6877c8cd3cff0ef1ba628d71acc981c520c29
 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
 CHROMIUM_TEST_FONTS_HASH=	cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=			16.13.2
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			65b32af46e9d7fab2e4ff657751205b3865f4920
 # 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
 
-YARN_TIMESTAMP=	1655443613
+YARN_TIMESTAMP=	1655950711
 
 GN_ARGS+=		clang_use_chrome_plugins=false \
 			enable_hangout_services_extension=true \
 			enable_js_type_check=false \
 			enable_nacl=false \
 			enable_one_click_signin=true \
 			enable_remoting=false \
 			enable_wmax_tokens=false \
 			fatal_linker_warnings=false \
 			is_clang=true \
 			optimize_webui=true \
 			toolkit_views=true \
 			treat_warnings_as_errors=false \
 			use_allocator="none" \
 			use_allocator_shim=false \
 			use_aura=true \
 			use_custom_libcxx=false \
 			use_gnome_keyring=false \
 			use_lld=true \
 			use_sysroot=false \
 			use_system_freetype=false \
 			use_system_harfbuzz=true \
 			use_system_libjpeg=true \
 			use_system_wayland_scanner=true \
 			use_udev=false \
 			extra_cxxflags="${CXXFLAGS}" \
 			extra_ldflags="${LDFLAGS}"
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_VERSION} < 130
 LLVM_DEFAULT=	13
 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}
 .else
 BINARY_ALIAS+=	ar=/usr/bin/llvm-ar \
 		nm=/usr/bin/llvm-nm
 .endif
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64=""
 .else
 PLIST_SUB+=	AMD64="@comment "
 .endif
 
 .if ${ARCH} == "i386"
 PLIST_SUB+=	I386=""
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
 
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \
 		then ${MKDIR} ${WRKDIR}; \
 		${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \
 			${WRKDIR}/.yarnrc; \
 		${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \
 		cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \
 			yarn --frozen-lockfile --ignore-scripts; \
 		${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \
 		${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \
 			@yarn-offline-cache.mtree; \
 		${RM} -r ${WRKDIR}; \
 	fi
 
 post-extract:
 # Move extracted sources to appropriate locations
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \
 		${WRKSRC}/third_party/nan
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
 		${WRKSRC}/third_party/electron_node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_squirrel_mac}-${SQUIRREL_MAC_VER} \
 		${WRKSRC}/third_party/squirrel.mac
 	${MKDIR} ${WRKSRC}/third_party/squirrel.mac/vendor
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reactiveobjc}-${REACTIVEOBJC_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
 		${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
 # Install node modules for electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
 	${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
 	${MV} ${WRKSRC}/electron/package.json ${WRKSRC}/electron/package.json.bak
 	${CP} ${FILESDIR}/package.json ${WRKSRC}/electron
 	cd ${WRKSRC}/electron && \
 		${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline
 
 pre-patch:
 	${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 \
 		flac fontconfig freetype harfbuzz-ng libdrm libpng libusb \
 		libwebp libxml libxslt openh264 opus snappy || ${FALSE}
 # Chromium uses an unreleased version of FFmpeg, so configure it
 .for brand in Chrome Chromium
 	${CP} -r \
 		${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \
 		${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd
 .endfor
 
 do-configure:
 # 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}'
 # 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
 	${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
 .for f in libEGL.so libGLESv2.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${f} ${STAGEDIR}${DATADIR}/swiftshader
 .endfor
 .for f in LICENSE LICENSES.chromium.html icudtl.dat 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:
 # Note 1: "npm install" will run before actual tests are executed
 # Note 2: Xvfb or something similar is necessary for headless testing
 	cd ${WRKSRC}/electron && \
 		${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} LOCAL_GIT_DIRECTORY=${LOCALBASE} \
 		npm run test -- --ci
 
 .include <bsd.port.post.mk>
diff --git a/devel/electron18/Makefile.version b/devel/electron18/Makefile.version
index 7fedfdb99019..18283dc75917 100644
--- a/devel/electron18/Makefile.version
+++ b/devel/electron18/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	18.3.4
+ELECTRON_VER=	18.3.5
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron18/distinfo b/devel/electron18/distinfo
index e25516f74a47..c51bfd2c23f1 100644
--- a/devel/electron18/distinfo
+++ b/devel/electron18/distinfo
@@ -1,21 +1,21 @@
-TIMESTAMP = 1655444360
+TIMESTAMP = 1655951956
 SHA256 (electron/chromium-100.0.4896.160.tar.xz) = a3f755dff069c6fae3eb7f07b33c0dd3f0762fa82959f41c7bd347da8efbacff
 SIZE (electron/chromium-100.0.4896.160.tar.xz) = 1228994280
 SHA256 (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 9793d0cfb94bf2ff099682dcd31ef46d1d7f42346c8a2f6355a5f8fda3dcd506
 SIZE (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 12028653
 SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
 SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650
-SHA256 (electron/electron-yarn-cache-18.3.4.tar.xz) = 9205dcfef74cc613d31b2704ba8a96eb30544cc19ea13b9eddb8d956e98199fb
-SIZE (electron/electron-yarn-cache-18.3.4.tar.xz) = 38391320
-SHA256 (electron/electron-electron-v18.3.4_GH0.tar.gz) = b730e7c95d21da006265c9bc959116c290715f0db47c2514b453214f5a1fd982
-SIZE (electron/electron-electron-v18.3.4_GH0.tar.gz) = 10209257
+SHA256 (electron/electron-yarn-cache-18.3.5.tar.xz) = 1988270c5c46db027718bd917f5fe4d0bcd7e5079aa57b72af22eadb964ff886
+SIZE (electron/electron-yarn-cache-18.3.5.tar.xz) = 38392736
+SHA256 (electron/electron-electron-v18.3.5_GH0.tar.gz) = ed9144b6e10c6f1c77adc4735606042cc4ea13c34a99abcafc965a0a5013c825
+SIZE (electron/electron-electron-v18.3.5_GH0.tar.gz) = 10236502
 SHA256 (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 93c65be15bfe8151b4a99d529538b23ffc6b5e0202dc7df0e32aa780ab49ad97
 SIZE (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 87972240
 SHA256 (electron/nodejs-nan-65b32af46e9d7fab2e4ff657751205b3865f4920_GH0.tar.gz) = a649b75bfa9c1a0254c73d022c6e98924b9471f593bcc83832daaf68da4cae8d
 SIZE (electron/nodejs-nan-65b32af46e9d7fab2e4ff657751205b3865f4920_GH0.tar.gz) = 178733
 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
diff --git a/devel/electron18/files/package.json b/devel/electron18/files/package.json
index 5ac68a087d05..51d1d6957d4d 100644
--- a/devel/electron18/files/package.json
+++ b/devel/electron18/files/package.json
@@ -1,144 +1,144 @@
 {
   "name": "electron",
-  "version": "18.3.4",
+  "version": "18.3.5",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
     "@azure/storage-blob": "^12.9.0",
     "@electron/docs-parser": "^0.12.3",
     "@electron/typescript-definitions": "^8.9.5",
     "@octokit/auth-app": "^2.10.0",
     "@octokit/rest": "^18.0.3",
     "@primer/octicons": "^10.0.0",
     "@types/basic-auth": "^1.1.3",
     "@types/busboy": "^0.2.3",
     "@types/chai": "^4.2.12",
     "@types/chai-as-promised": "^7.1.3",
     "@types/dirty-chai": "^2.0.2",
     "@types/express": "^4.17.13",
     "@types/fs-extra": "^9.0.1",
     "@types/klaw": "^3.0.1",
     "@types/minimist": "^1.2.0",
     "@types/mocha": "^7.0.2",
     "@types/node": "^16.11.26",
     "@types/semver": "^7.3.3",
     "@types/send": "^0.14.5",
     "@types/split": "^1.0.0",
     "@types/stream-json": "^1.5.1",
     "@types/temp": "^0.8.34",
     "@types/uuid": "^3.4.6",
     "@types/webpack": "^4.41.21",
     "@types/webpack-env": "^1.16.3",
     "@typescript-eslint/eslint-plugin": "^4.4.1",
     "@typescript-eslint/parser": "^4.4.1",
     "asar": "^3.1.0",
     "aws-sdk": "^2.814.0",
     "check-for-leaks": "^1.2.1",
     "colors": "1.4.0",
     "dotenv-safe": "^4.0.4",
     "dugite": "^1.103.0",
     "eslint": "^7.4.0",
     "eslint-config-standard": "^14.1.1",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-mocha": "^7.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-standard": "^4.0.1",
     "eslint-plugin-typescript": "^0.14.0",
     "express": "^4.16.4",
     "folder-hash": "^2.1.1",
     "fs-extra": "^9.0.1",
     "got": "^6.3.0",
     "husky": "^6.0.0",
     "klaw": "^3.0.0",
     "lint": "^1.1.2",
     "lint-staged": "^10.2.11",
     "markdownlint": "^0.21.1",
     "markdownlint-cli": "^0.25.0",
     "minimist": "^1.2.5",
     "null-loader": "^4.0.0",
     "pre-flight": "^1.1.0",
     "remark-cli": "^10.0.0",
     "remark-preset-lint-markdown-style-guide": "^4.0.0",
     "semver": "^5.6.0",
     "shx": "^0.3.2",
     "standard-markdown": "^6.0.0",
     "stream-json": "^1.7.1",
     "tap-xunit": "^2.4.1",
     "temp": "^0.8.3",
     "timers-browserify": "1.4.2",
     "ts-loader": "^8.0.2",
     "ts-node": "6.2.0",
     "typescript": "^4.5.5",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.12",
     "wrapper-webpack-plugin": "^2.1.0"
   },
   "private": true,
   "scripts": {
     "asar": "asar",
     "generate-version-json": "node script/generate-version-json.js",
     "lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs",
     "lint:js": "node ./script/lint.js --js",
     "lint:clang-format": "python3 script/run-clang-format.py -r -c shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
     "lint:clang-tidy": "ts-node ./script/run-clang-tidy.ts",
     "lint:cpp": "node ./script/lint.js --cc",
     "lint:objc": "node ./script/lint.js --objc",
     "lint:py": "node ./script/lint.js --py",
     "lint:gn": "node ./script/lint.js --gn",
     "lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:docs-relative-links && npm run lint:markdownlint",
     "lint:docs-relative-links": "python3 ./script/check-relative-doc-links.py",
     "lint:markdownlint": "markdownlint \"*.md\" \"docs/**/*.md\"",
     "lint:js-in-markdown": "standard-markdown docs",
     "create-api-json": "electron-docs-parser --dir=./",
     "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js",
     "gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts",
     "pre-flight": "pre-flight",
     "gn-check": "node ./script/gn-check.js",
     "precommit": "lint-staged",
     "preinstall": "node -e 'process.exit(0)'",
     "prepack": "check-for-leaks",
     "repl": "node ./script/start.js --interactive",
     "start": "node ./script/start.js",
     "test": "node ./script/spec-runner.js",
     "tsc": "tsc",
     "webpack": "webpack"
   },
   "license": "MIT",
   "author": "Electron Community",
   "keywords": [
     "electron"
   ],
   "lint-staged": {
     "*.{js,ts}": [
       "node script/lint.js --js --fix --only --"
     ],
     "*.{js,ts,d.ts}": [
       "ts-node script/gen-filenames.ts"
     ],
     "*.{cc,mm,c,h}": [
       "python3 script/run-clang-format.py -r -c --fix"
     ],
     "*.md": [
       "npm run lint:docs"
     ],
     "*.{gn,gni}": [
       "npm run gn-check",
       "python3 script/run-gn-format.py"
     ],
     "*.py": [
       "node script/lint.js --py --fix --only --"
     ],
     "docs/api/**/*.md": [
       "ts-node script/gen-filenames.ts",
       "markdownlint --config .markdownlint.autofix.json --fix",
       "git add filenames.auto.gni"
     ],
     "{*.patch,.patches}": [
       "node script/lint.js --patches --only --",
       "ts-node script/check-patch-diff.ts"
     ],
     "DEPS": [
       "node script/gen-hunspell-filenames.js"
     ]
   }
 }
diff --git a/devel/electron18/files/patch-electron_BUILD.gn b/devel/electron18/files/patch-electron_BUILD.gn
index 78c424382acf..aefbc014250c 100644
--- a/devel/electron18/files/patch-electron_BUILD.gn
+++ b/devel/electron18/files/patch-electron_BUILD.gn
@@ -1,71 +1,71 @@
---- electron/BUILD.gn.orig	2022-05-18 15:31:32 UTC
+--- electron/BUILD.gn.orig	2022-06-22 15:31:20 UTC
 +++ electron/BUILD.gn
-@@ -444,7 +444,7 @@ source_set("electron_lib") {
+@@ -447,7 +447,7 @@ source_set("electron_lib") {
      defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
    }
  
 -  if (!is_mas_build) {
 +  if (!is_mas_build && !is_bsd) {
      deps += [
        "//components/crash/core/app",
        "//components/crash/core/browser",
-@@ -486,6 +486,10 @@ source_set("electron_lib") {
+@@ -489,6 +489,10 @@ source_set("electron_lib") {
      ]
    }
  
 +  if (is_bsd) {
 +    deps -= [ "//components/crash/content/browser" ]
 +  }
 +
    if (is_mac) {
      deps += [
        "//components/remote_cocoa/app_shim",
-@@ -540,6 +544,12 @@ source_set("electron_lib") {
+@@ -543,6 +547,12 @@ source_set("electron_lib") {
        cflags_objcc = [ "-fobjc-weak" ]
      }
    }
 +  if (is_bsd) {
 +    sources -= [
 +      "shell/common/crash_keys.cc",
 +      "shell/common/crash_keys.h",
 +    ]
 +  }
    if (is_linux) {
      libs = [ "xshmfence" ]
      deps += [
-@@ -1182,7 +1192,7 @@ if (is_mac) {
+@@ -1185,7 +1195,7 @@ if (is_mac) {
        ":electron_app_manifest",
        ":electron_lib",
        ":packed_resources",
 -      "//components/crash/core/app",
 +      # "//components/crash/core/app",
        "//content:sandbox_helper_win",
        "//electron/buildflags",
        "//ui/strings",
-@@ -1208,7 +1218,7 @@ if (is_mac) {
+@@ -1211,7 +1221,7 @@ if (is_mac) {
        public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
      }
  
 -    if (is_linux) {
 +    if (is_linux && !is_bsd) {
        data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ]
      }
  
-@@ -1276,7 +1286,7 @@ if (is_mac) {
+@@ -1279,7 +1289,7 @@ if (is_mac) {
          configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
        }
  
 -      if (is_linux) {
 +      if (is_linux && !is_bsd) {
          deps += [ "//sandbox/linux:chrome_sandbox" ]
        }
      }
-@@ -1412,7 +1422,7 @@ dist_zip("electron_dist_zip") {
+@@ -1415,7 +1425,7 @@ dist_zip("electron_dist_zip") {
      ":electron_version",
      ":licenses",
    ]
 -  if (is_linux) {
 +  if (is_linux && !is_bsd) {
      data_deps += [ "//sandbox/linux:chrome_sandbox" ]
    }
    deps = data_deps
diff --git a/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.cc
index e21d597f8014..d84ee79d77bd 100644
--- a/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.cc
+++ b/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.cc
@@ -1,93 +1,93 @@
---- electron/shell/browser/electron_browser_main_parts.cc.orig	2022-05-25 15:32:14 UTC
+--- electron/shell/browser/electron_browser_main_parts.cc.orig	2022-06-22 15:31:20 UTC
 +++ electron/shell/browser/electron_browser_main_parts.cc
 @@ -64,7 +64,7 @@
  #include "ui/wm/core/wm_state.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/environment.h"
  #include "base/threading/thread_task_runner_handle.h"
  #include "device/bluetooth/bluetooth_adapter_factory.h"
 @@ -145,7 +145,7 @@ std::u16string MediaStringProvider(media::MessageId id
    }
  }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // GTK does not provide a way to check if current theme is dark, so we compare
  // the text and background luminosity to get a result.
  // This trick comes from FireFox.
 @@ -163,7 +163,7 @@ void UpdateDarkThemeSetting() {
  
  }  // namespace
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  class DarkThemeObserver : public ui::NativeThemeObserver {
   public:
    DarkThemeObserver() = default;
 @@ -216,7 +216,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization()
  #if BUILDFLAG(IS_POSIX)
    HandleSIGCHLD();
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    ui::OzonePlatform::PreEarlyInitialization();
  #endif
  
 @@ -277,7 +277,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
  #if defined(USE_AURA)
    screen_ = views::CreateDesktopScreen();
    display::Screen::SetScreenInstance(screen_.get());
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    views::LinuxUI::instance()->UpdateDeviceScaleFactor();
  #endif
  #endif
 @@ -294,7 +294,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
    // happen before the ResourceBundle is loaded
    if (locale.empty())
      l10n_util::OverrideLocaleWithCocoaLocale();
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // l10n_util::GetApplicationLocaleInternal uses g_get_language_names(),
    // which keys off of getenv("LC_ALL").
    // We must set this env first to make ui::ResourceBundle accept the custom
 @@ -317,7 +317,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
    ElectronBrowserClient::SetApplicationLocale(app_locale);
    fake_browser_process_->SetApplicationLocale(app_locale);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Reset to the original LC_ALL since we should not be changing it.
    if (!locale.empty()) {
      if (lc_all)
 @@ -364,7 +364,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
  }
  
  void ElectronBrowserMainParts::ToolkitInitialized() {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto linux_ui = BuildGtkUi();
    linux_ui->Initialize();
    DCHECK(ui::LinuxInputMethodContextFactory::instance());
-@@ -477,7 +477,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
+@@ -481,7 +481,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
    ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop(
        std::move(shutdown_cb));
    bluez::DBusBluezManagerWrapperLinux::Initialize();
 +#endif
  
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Set up crypt config. This needs to be done before anything starts the
    // network service, as the raw encryption key needs to be shared with the
    // network service for encrypted cookie storage.
-@@ -536,7 +538,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
+@@ -540,7 +542,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
    fake_browser_process_->PostMainMessageLoopRun();
    content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
  #endif
  }
diff --git a/devel/electron18/files/patch-electron_spec-main_api-browser-window-spec.ts b/devel/electron18/files/patch-electron_spec-main_api-browser-window-spec.ts
index a861ea661bce..b42518664f7a 100644
--- a/devel/electron18/files/patch-electron_spec-main_api-browser-window-spec.ts
+++ b/devel/electron18/files/patch-electron_spec-main_api-browser-window-spec.ts
@@ -1,146 +1,146 @@
---- electron/spec-main/api-browser-window-spec.ts.orig	2022-06-15 15:31:31 UTC
+--- electron/spec-main/api-browser-window-spec.ts.orig	2022-06-22 15:31:20 UTC
 +++ electron/spec-main/api-browser-window-spec.ts
 @@ -60,7 +60,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(__dirname, 'spec-main', 'fixtures', 'apps', 'xwindow-icon');
        const appProcess = childProcess.spawn(process.execPath, [appPath]);
        await new Promise((resolve) => { appProcess.once('exit', resolve); });
 @@ -738,7 +738,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 = emittedOnce(w, 'maximize');
          const shown = emittedOnce(w, 'show');
          w.maximize();
 @@ -775,7 +775,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 });
 @@ -842,7 +842,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 });
 @@ -1240,7 +1240,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 = emittedOnce(w, 'maximize');
 @@ -1367,7 +1367,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 = emittedOnce(w, 'minimize');
-@@ -2215,7 +2215,7 @@ describe('BrowserWindow module', () => {
+@@ -2251,7 +2251,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);
-@@ -2241,7 +2241,7 @@ describe('BrowserWindow module', () => {
+@@ -2277,7 +2277,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);
-@@ -3047,7 +3047,7 @@ describe('BrowserWindow module', () => {
+@@ -3083,7 +3083,7 @@ describe('BrowserWindow module', () => {
          expect(test.versions).to.deep.equal(process.versions);
          expect(test.contextId).to.be.a('string');
  
 -        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 {
-@@ -3620,7 +3620,7 @@ describe('BrowserWindow module', () => {
+@@ -3656,7 +3656,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 });
-@@ -3879,7 +3879,7 @@ describe('BrowserWindow module', () => {
+@@ -3915,7 +3915,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 });
-@@ -3916,7 +3916,7 @@ describe('BrowserWindow module', () => {
+@@ -3952,7 +3952,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 = emittedOnce(w, 'minimize');
        w.minimize();
-@@ -4271,7 +4271,7 @@ describe('BrowserWindow module', () => {
+@@ -4307,7 +4307,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');
  
-@@ -4363,7 +4363,7 @@ describe('BrowserWindow module', () => {
+@@ -4399,7 +4399,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);
  
-@@ -5287,7 +5287,7 @@ describe('BrowserWindow module', () => {
+@@ -5323,7 +5323,7 @@ describe('BrowserWindow module', () => {
      });
  
      // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
 -    ifit(process.platform !== 'linux' && process.arch !== 'arm64')('should not display a visible background', async () => {
 +    ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && process.arch !== 'arm64')('should not display a visible background', async () => {
        const display = screen.getPrimaryDisplay();
  
        const backgroundWindow = new BrowserWindow({
-@@ -5329,7 +5329,7 @@ describe('BrowserWindow module', () => {
+@@ -5365,7 +5365,7 @@ describe('BrowserWindow module', () => {
      afterEach(closeAllWindows);
  
      // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
 -    ifit(process.platform !== 'linux' && process.arch !== 'arm64')('should display the set color', async () => {
 +    ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && process.arch !== 'arm64')('should display the set color', async () => {
        const display = screen.getPrimaryDisplay();
  
        const w = new BrowserWindow({
diff --git a/devel/electron18/files/patch-ui_gtk_gtk__compat.cc b/devel/electron18/files/patch-ui_gtk_gtk__compat.cc
index 1d46f621a215..2b7b3712d735 100644
--- a/devel/electron18/files/patch-ui_gtk_gtk__compat.cc
+++ b/devel/electron18/files/patch-ui_gtk_gtk__compat.cc
@@ -1,50 +1,53 @@
---- ui/gtk/gtk_compat.cc.orig	2022-05-11 07:17:07 UTC
+--- ui/gtk/gtk_compat.cc.orig	2022-06-23 06:01:33 UTC
 +++ ui/gtk/gtk_compat.cc
-@@ -62,27 +62,47 @@ auto DlCast(void* symbol) {
+@@ -62,22 +62,38 @@ auto DlCast(void* symbol) {
  }
  
  void* GetLibGio() {
 +#if defined(OS_BSD)
 +  static void* libgio = DlOpen("libgio-2.0.so");
 +#else
    static void* libgio = DlOpen("libgio-2.0.so.0");
 +#endif
    return libgio;
  }
  
- void* GetLibGdkPixbuf() {
-+#if defined(OS_BSD)
-+  static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so");
-+#else
-   static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
-+#endif
-   return libgdk_pixbuf;
- }
- 
  void* GetLibGdk3() {
 +#if defined(OS_BSD)
 +  static void* libgdk3 = DlOpen("libgdk-3.so");
 +#else
    static void* libgdk3 = DlOpen("libgdk-3.so.0");
 +#endif
    return libgdk3;
  }
  
  void* GetLibGtk3(bool check = true) {
 +#if defined(OS_BSD)
 +  static void* libgtk3 = DlOpen("libgtk-3.so", check);
 +#else
    static void* libgtk3 = DlOpen("libgtk-3.so.0", check);
 +#endif
    return libgtk3;
  }
  
  void* GetLibGtk4(bool check = true) {
 +#if defined(OS_BSD)
 +  static void* libgtk4 = DlOpen("libgtk-4.so", check);
 +#else
    static void* libgtk4 = DlOpen("libgtk-4.so.1", check);
 +#endif
    return libgtk4;
  }
  
+@@ -123,7 +139,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& borde
+ }  // namespace
+ 
+ void* GetLibGdkPixbuf() {
++#if defined(OS_BSD)
++  static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so");
++#else
+   static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
++#endif
+   return libgdk_pixbuf;
+ }
+